[Git][ghc/ghc][ghc-9.6] darwin ci: Explicitly pass desired build triple to configure

[Matthew Pickering (@mpickering)]

Matthew Pickering pushed to branch ghc-9.6 at Glasgow Haskell Compiler / GHC


Commits:
079b443b by Matthew Pickering at 2023-01-10T16:47:59+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.

(cherry picked from commit 0db496ff1e372b19429fee91a4a569f7021fe1d7)

- - - - -


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/079b443bf94cf5c9eadc0ae75045605758fbc889

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/079b443bf94cf5c9eadc0ae75045605758fbc889
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/20230110/c05a4eb0/attachment.html>