[Git][ghc/ghc][wip/t22599] testing

[Matthew Pickering (@mpickering)]

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


Commits:
b5c10e9e by Matthew Pickering at 2023-01-05T09:13:10+00:00
testing

- - - - -


1 changed file:

- .gitlab/ci.sh


Changes:

=====================================
.gitlab/ci.sh
=====================================
@@ -213,11 +213,17 @@ function set_toolchain_paths() {
           x86_64-darwin|aarch64-darwin) ;;
           *) fail "unknown NIX_SYSTEM" ;;
         esac
-        clang++ -v a.cpp -o a.o
-        clang++ -v a.o -o a
-        clang -v a.o c++ -lc++abi -o a
 
-        nix-build .gitlab/darwin/toolchain.nix --argstr system "$NIX_SYSTEM" -o toolchain.sh
+        if [ "$NIX_SYSTEM" -eq "aarch64-darwin" ];
+          then ARCH="arm64";
+          else ARCH="x86_64";
+        fi
+
+        arch -arm64 clang++ -v a.cpp -o a.o
+        arch -arm64 clang++ -v a.o -o a
+        arch -arm64 clang -v a.o c++ -lc++abi -o a
+
+        arch "-$ARCH" nix-build .gitlab/darwin/toolchain.nix --argstr system "$NIX_SYSTEM" -o toolchain.sh
         cat toolchain.sh
       fi
       source toolchain.sh ;;



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b5c10e9ec0fafea199a53c543107ba8ed391d2e9
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/20230105/f66503a6/attachment-0001.html>