Commit 9c787d4d authored by Ben Gamari's avatar Ben Gamari 🐢

gitlab-ci: Propagate BUILD_PROF_LIBS to make on Windows

Ensures that #15934 doesn't break the 32-bit Windows release build.
parent b3da8786
Pipeline #9630 passed with stages
in 388 minutes and 21 seconds
......@@ -562,15 +562,17 @@ nightly-i386-windows-hadrian:
# due to #16084
allow_failure: true
variables:
BUILD_FLAVOUR: "quick"
BUILD_FLAVOUR: "UNSET"
GHC_VERSION: "8.6.2"
BUILD_PROF_LIBS: "YES"
BIN_DIST_PREP_TAR_COMP: "bindistprep/ghc-x86_64-mingw32.tar.xz"
script:
- |
python boot
bash -c './configure --enable-tarballs-autodownload GHC=`pwd`/toolchain/bin/ghc HAPPY=`pwd`/toolchain/bin/happy ALEX=`pwd`/toolchain/bin/alex $CONFIGURE_ARGS'
- bash -c "echo include mk/flavours/${BUILD_FLAVOUR}.mk > mk/build.mk"
- bash -c "echo 'GhcLibHcOpts+=-haddock' >> mk/build.mk"
- bash -c "echo \"include mk/flavours/${BUILD_FLAVOUR}.mk\" > mk/build.mk"
- bash -c "echo \"GhcLibHcOpts+=-haddock\" >> mk/build.mk"
- bash -c "echo \"BUILD_PROF_LIBS = $BUILD_PROF_LIBS\" >> mk/build.mk"
- bash -c "PATH=`pwd`/toolchain/bin:$PATH make -j`mk/detect-cpu-count.sh`"
- bash -c "PATH=`pwd`/toolchain/bin:$PATH make binary-dist TAR_COMP_OPTS=-1"
- bash -c 'make V=0 test THREADS=`mk/detect-cpu-count.sh` JUNIT_FILE=../../junit.xml'
......@@ -589,6 +591,7 @@ validate-x86_64-windows:
extends: .build-windows-make
variables:
MSYSTEM: MINGW64
BUILD_FLAVOUR: "quick"
CONFIGURE_ARGS: "--target=x86_64-unknown-mingw32"
cache:
key: "x86_64-windows-$WINDOWS_TOOLCHAIN_VERSION"
......@@ -624,6 +627,7 @@ nightly-i386-windows:
variables:
MSYSTEM: MINGW32
CONFIGURE_ARGS: "--target=i386-unknown-mingw32"
BUILD_FLAVOUR: "quick"
# Due to #15934
BUILD_PROF_LIBS: "NO"
cache:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment