merge bitcoin#29828: remove gcc-toolchain static from Windows build

dashpay · Nov 10, 2024 · 4d1f7dc · 4d1f7dc
1 parent f321d3d
commit 4d1f7dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
@@ -77,9 +77,8 @@ export OBJC_INCLUDE_PATH="${NATIVE_GCC}/include"
 export OBJCPLUS_INCLUDE_PATH="${NATIVE_GCC}/include/c++:${NATIVE_GCC}/include"
 
 case "$HOST" in
-    *darwin*)
-        export LIBRARY_PATH="${NATIVE_GCC}/lib"
-        ;;
+    *darwin*) export LIBRARY_PATH="${NATIVE_GCC}/lib" ;;
+    *mingw*) export LIBRARY_PATH="${NATIVE_GCC}/lib" ;;
     *)
         NATIVE_GCC_STATIC="$(store_path gcc-toolchain static)"
         export LIBRARY_PATH="${NATIVE_GCC}/lib:${NATIVE_GCC_STATIC}/lib"

diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm
@@ -576,7 +576,6 @@ inspecting signatures in Mach-O binaries.")
     (cond ((string-suffix? "-mingw32" target)
            (list ;; Native GCC 12 toolchain
                  gcc-toolchain-12
-                 (list gcc-toolchain-12 "static")
                  zip
                  (make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32")
                  nsis-x86_64