diff options
| author | fanquake <fanquake@gmail.com> | 2024-04-04 13:32:15 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2024-04-07 14:06:27 +0100 |
| commit | 05da2460db895374ea1fd89e4b8b4b73689f8faf (patch) | |
| tree | 254012df15c4c9e280a9f4656dddb6ecd3bade97 | |
| parent | f0794cbd405636a7f528a60f2873050b865cf7e8 (diff) | |
| download | bitcoin-05da2460db895374ea1fd89e4b8b4b73689f8faf.tar.xz | |
guix: remove gcc-toolchain static from Windows build
The libs in this dir are the following:
```bash
ls /gnu/store/2vnbkrdin4rrf7ygnr80mlcglin4qqa4-gcc-toolchain-12.3.0-static/lib/lib
libanl.a libc.a libdl.a libm.a
libBrokenLocale.a libcrypt.a libg.a libmcheck.a
libpthread.a librt.a
libresolv.a libutil.a
```
These do not need to be propogated into the Windows build environment.
| -rwxr-xr-x | contrib/guix/libexec/build.sh | 5 | ||||
| -rw-r--r-- | contrib/guix/manifest.scm | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index 9624221880..1e9b682f3f 100755 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -75,9 +75,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 index 87dcf49bcb..41a87eec57 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -517,7 +517,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 |