diff options
author | Matthew Pickering <matthewtpickering@gmail.com> | 2023-01-06 13:09:51 +0000 |
---|---|---|
committer | Matthew Pickering <matthewtpickering@gmail.com> | 2023-01-06 13:09:51 +0000 |
commit | 97dbbcc947f2febb4a039d8d46afb07eab6a5f7f (patch) | |
tree | 65e8a289dc1b49423c29feca26a924f8c6d9ec70 | |
parent | baa3e031735070ff25f4e05c2b14e084bcab4281 (diff) | |
download | haskell-wip/t22599.tar.gz |
darwin ci: Explicitly pass desired build triple to configurewip/t22599
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}" ''; } |