diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2023-01-06 13:09:51 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2023-01-06 22:08:53 -0500 |
| commit | 0db496ff1e372b19429fee91a4a569f7021fe1d7 (patch) | |
| tree | 674e5871dc500a97da1425c7fc059a944b4ebdb1 | |
| parent | c306d939d2e1b08cbe683bb9829a4b4010948010 (diff) | |
| download | haskell-0db496ff1e372b19429fee91a4a569f7021fe1d7.tar.gz | |
darwin ci: Explicitly pass desired build triple to configure
On the zw3rk machines for some reason the build machine was inferred to
be arm64. Setting the build triple appropiately resolve this confusion
and we produce x86 binaries.
| -rw-r--r-- | .gitlab/darwin/toolchain.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab/darwin/toolchain.nix b/.gitlab/darwin/toolchain.nix index ba5b21786c..11844f31da 100644 --- a/.gitlab/darwin/toolchain.nix +++ b/.gitlab/darwin/toolchain.nix @@ -113,6 +113,6 @@ pkgs.writeTextFile { export CABAL="$CABAL_INSTALL" sdk_path="$(xcrun --sdk macosx --show-sdk-path)" - export CONFIGURE_ARGS="$CONFIGURE_ARGS --with-ffi-libraries=$sdk_path/usr/lib --with-ffi-includes=$sdk_path/usr/include/ffi" + export CONFIGURE_ARGS="$CONFIGURE_ARGS --with-ffi-libraries=$sdk_path/usr/lib --with-ffi-includes=$sdk_path/usr/include/ffi --build=${targetTriple}" ''; } |