diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-03-20 23:45:26 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-03-20 23:45:26 -0400 |
| commit | 8fadd9b99ceface290d4bbe3b0f85d49a44eef0a (patch) | |
| tree | ce436a95c086a10496ac3d5a5c441e0bf601f4a2 | |
| parent | f7b390da51550e0e5020143b9dd2d3701d84b427 (diff) | |
| download | haskell-wip/windows-32bit.tar.gz | |
gitlab-ci: Pass --target explicitly to configure on Windowswip/windows-32bit
Otherwise configure fails in the 32-bit case with
```
This GHC (c:/GitLabRunner/builds/8fc0e283/0/ghc/ghc/toolchain/bin/ghc) does not generate code for the build platform
GHC target platform : x86_64-unknown-mingw32
Desired build platform : i386-unknown-mingw32
```
| -rw-r--r-- | .gitlab-ci.yml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f6a5998077..e240ceebec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -477,7 +477,7 @@ nightly-i386-windows-hadrian: script: - | python boot - bash -c './configure --enable-tarballs-autodownload GHC=`pwd`/toolchain/bin/ghc HAPPY=`pwd`/toolchain/bin/happy ALEX=`pwd`/toolchain/bin/alex' + 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 "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" @@ -497,6 +497,7 @@ validate-x86_64-windows: extends: .build-windows-make variables: MSYSTEM: MINGW64 + CONFIGURE_ARGS: "--target=x86_64-unknown-mingw32" cache: key: x86_64-windows @@ -506,6 +507,7 @@ release-x86_64-windows: variables: MSYSTEM: MINGW64 BUILD_FLAVOUR: "perf" + CONFIGURE_ARGS: "--target=x86_64-unknown-mingw32" only: - tags @@ -516,6 +518,7 @@ release-i386-windows: variables: MSYSTEM: MINGW32 BUILD_FLAVOUR: "perf" + CONFIGURE_ARGS: "--target=i386-unknown-mingw32" cache: key: i386-windows @@ -526,6 +529,7 @@ nightly-i386-windows: - $NIGHTLY variables: MSYSTEM: MINGW32 + CONFIGURE_ARGS: "--target=i386-unknown-mingw32" cache: key: i386-windows |