From 97dbbcc947f2febb4a039d8d46afb07eab6a5f7f Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Fri, 6 Jan 2023 13:09:51 +0000 Subject: 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. --- .gitlab/darwin/toolchain.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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}" ''; } -- cgit v1.2.1