[Git][ghc/ghc][wip/t22599] hack

[aaa (@project_1_bot2)]

aaa pushed to branch wip/t22599 at Glasgow Haskell Compiler / GHC


Commits:
5e9a750c by GHC GitLab CI at 2023-01-06T01:20:09+08:00
hack

- - - - -


2 changed files:

- .gitlab/ci.sh
- .gitlab/darwin/toolchain.nix


Changes:

=====================================
.gitlab/ci.sh
=====================================
@@ -219,13 +219,16 @@ function set_toolchain_paths() {
           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 -arm64 clang++ -v -c a.cpp -o a.o
+#	lipo -info a.o
+
+#        arch -arm64 clang++ --target=aarch64-darwin -v a.o -o a
+#        arch -arm64 clang -v a.o -lc++ -lc++abi -o a
+#        clang -v a.o -lc++ -lc++abi -o a
 
 	echo $ARCH
 	echo $NIX_SYSTEM
-        arch "-$ARCH" nix-build .gitlab/darwin/toolchain.nix --argstr system "$NIX_SYSTEM" -o toolchain.sh
+        nix-build .gitlab/darwin/toolchain.nix --argstr system "$NIX_SYSTEM" -o toolchain.sh
         cat toolchain.sh
       fi
       source toolchain.sh ;;


=====================================
.gitlab/darwin/toolchain.nix
=====================================
@@ -37,8 +37,9 @@ let
       "CONF_GCC_LINKER_OPTS_STAGE2=--target=${targetTriple}"
     ];
     buildPhase = "true"; 
-    postUnpackPhase = ''
-      /usr/bin/clang -v
+    preConfigure = ''
+      sed "s/\"\$CC\" -o actest actest.o \''${1} 2>\/dev\/null/true/i" configure
+      cat configure
 
     '';
 



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

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