guix: Put gcc to the manifest

hebasto · Sep 30, 2024 · 8b9a42e · 8b9a42e
1 parent 1a0d7f3
commit 8b9a42e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
@@ -63,8 +63,8 @@ store_path() {
 echo ----------------------------------------------------------------
 cat "${GUIX_ENVIRONMENT}/manifest"
 echo ----------------------------------------------------------------
-grep --extended-regexp "/[^-]{32}-gcc-[^-]+" "${GUIX_ENVIRONMENT}/manifest"
-# NATIVE_GCC="$(store_path gcc)"
+# grep --extended-regexp "/[^-]{32}-gcc-[^-]+" "${GUIX_ENVIRONMENT}/manifest"
+NATIVE_GCC="$(store_path gcc)"
 
 echo NATIVE_GCC=${NATIVE_GCC}
 ls -l ${NATIVE_GCC}

diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm
@@ -530,7 +530,8 @@ inspecting signatures in Mach-O binaries.")
                  (list gcc-toolchain-12 "static")
                  (make-bitcoin-cross-toolchain target)))
           ((string-contains target "darwin")
-           (list clang-toolchain-18
+           (list gcc
+                 clang-toolchain-18
                  lld-18
                  (make-lld-wrapper lld-18 #:lld-as-ld? #t)
                  python-signapple