[Git][ghc/ghc][wip/t22599] debugging

[aaa (@project_1_bot2)]

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


Commits:
3cb69bd6 by GHC GitLab CI at 2023-01-05T20:34:34+08:00
debugging

- - - - -


2 changed files:

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


Changes:

=====================================
.gitlab/ci.sh
=====================================
@@ -214,15 +214,17 @@ function set_toolchain_paths() {
           *) fail "unknown NIX_SYSTEM" ;;
         esac
 
-        if [ "$NIX_SYSTEM" -eq "aarch64-darwin" ];
+        if [ "$NIX_SYSTEM" = "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 -arm64 clang++ -v a.o -o a
+        # arch -arm64 clang -v a.o c++ -lc++abi -o a
 
+	echo $ARCH
+	echo $NIX_SYSTEM
         arch "-$ARCH" nix-build .gitlab/darwin/toolchain.nix --argstr system "$NIX_SYSTEM" -o toolchain.sh
         cat toolchain.sh
       fi


=====================================
.gitlab/darwin/toolchain.nix
=====================================
@@ -31,12 +31,16 @@ let
       "CC=/usr/bin/clang"
       "CLANG=/usr/bin/clang"
       "LLC=${llvm}/bin/llc"
-      "OPT=${llvm}/bin/opt"
+      "OPT=${llvm}/bin/opt  "
       "CONF_CC_OPTS_STAGE2=--target=${targetTriple}"
       "CONF_CXX_OPTS_STAGE2=--target=${targetTriple}"
       "CONF_GCC_LINKER_OPTS_STAGE2=--target=${targetTriple}"
     ];
-    buildPhase = "true";
+    buildPhase = "true"; 
+    postUnpackPhase = ''
+      /usr/bin/clang -v
+
+    '';
 
     # N.B. Work around #20253.
     nativeBuildInputs = [ pkgs.gnused ];



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3cb69bd6722e59a530293f46143b09928a22a85e
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/1d98d17d/attachment-0001.html>