From 8b9a42eb7281b66f72f5935c91bb11e90c0ac7b0 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Mon, 30 Sep 2024 13:05:48 +0100
Subject: [PATCH] guix: Put `gcc` to the manifest

---
 contrib/guix/libexec/build.sh | 4 ++--
 contrib/guix/manifest.scm     | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index 1f29bcb46b835..7b2d720b7eaf2 100755
--- 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
index ce291c39ce76e..73e74be3fef8d 100644
--- 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