@@ -89,6 +89,13 @@ COMMON_MAKEFLAGS=--jobs=$NPROC
# Clear MAKEFLAGS that may come from the outside world.
MAKEFLAGS=$COMMON_MAKEFLAGS
+# Use common options for "make" (cmake in "vs-build" below uses the
+# intermediate variables directly)
+DEVELOPER=1
+MAKEFLAGS="$MAKEFLAGS DEVELOPER=$DEVELOPER"
+SKIP_DASHED_BUILT_INS=YesPlease
+MAKEFLAGS="$MAKEFLAGS SKIP_DASHED_BUILT_INS=$SKIP_DASHED_BUILT_INS"
+
case "$CI_TYPE" in
github-actions)
CC="${CC_PACKAGE:-${CC:-gcc}}"
@@ -105,10 +112,8 @@ github-actions)
;;
esac
-setenv --build DEVELOPER 1
setenv --test DEFAULT_TEST_TARGET prove
setenv --test GIT_TEST_CLONE_2GB true
-setenv --build SKIP_DASHED_BUILT_INS YesPlease
case "$runs_on_pool" in
ubuntu-latest)
@@ -145,6 +150,9 @@ windows-test)
setenv --test MAKEFLAGS "$COMMON_MAKEFLAGS"
;;
vs-build)
+ setenv --build DEVELOPER $DEVELOPER
+ setenv --build SKIP_DASHED_BUILT_INS $SKIP_DASHED_BUILT_INS
+
setenv --build NO_PERL NoThanks
setenv --build NO_GETTEXT NoThanks
setenv --build ARTIFACTS_DIRECTORY artifacts
It's clearer that "DEVELOPER" is a flag that affects the Makefile itself in particular if it's put into "MAKEFLAGS than" if it generically sits in the environment. Let's move both it and "SKIP_DASHED_BUILT_INS" to "MAKEFLAGS". We can't do this under vs-build, since that invokes cmake. Let's have only that job set these in the environment. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- ci/lib.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)