[Git][ghc/ghc][wip/t22599] darwin ci: Explicitly pass desired build triple to configure

[Matthew Pickering (@mpickering)]

Matthew Pickering pushed to branch wip/t22599 at Glasgow Haskell Compiler / GHC


Commits:
97dbbcc9 by Matthew Pickering at 2023-01-06T13:09:51+00:00
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.

- - - - -


1 changed file:

- .gitlab/darwin/toolchain.nix


Changes:

=====================================
.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}"
   '';
 }



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/97dbbcc947f2febb4a039d8d46afb07eab6a5f7f

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/97dbbcc947f2febb4a039d8d46afb07eab6a5f7f
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230106/9460a09c/attachment-0001.html>