phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 23:09:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

guix: remove gcc-toolchain static from Windows build

Browse source 
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.
This commit is contained in:
fanquake 2024-04-04 13:32:15 +01:00
parent f0794cbd40
commit 05da2460db
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
contrib/guix/libexec/build.sh
View file

@ -75,9 +75,8 @@ export OBJC_INCLUDE_PATH="${NATIVE_GCC}/include"
export OBJCPLUS_INCLUDE_PATH="${NATIVE_GCC}/include/c++:${NATIVE_GCC}/include" export OBJCPLUS_INCLUDE_PATH="${NATIVE_GCC}/include/c++:${NATIVE_GCC}/include"
case "$HOST" in case "$HOST" in
*darwin*) *darwin*) export LIBRARY_PATH="${NATIVE_GCC}/lib" ;;
export LIBRARY_PATH="${NATIVE_GCC}/lib" *mingw*) export LIBRARY_PATH="${NATIVE_GCC}/lib" ;;
;;
*) *)
NATIVE_GCC_STATIC="$(store_path gcc-toolchain static)" NATIVE_GCC_STATIC="$(store_path gcc-toolchain static)"
export LIBRARY_PATH="${NATIVE_GCC}/lib:${NATIVE_GCC_STATIC}/lib" export LIBRARY_PATH="${NATIVE_GCC}/lib:${NATIVE_GCC_STATIC}/lib"

1
contrib/guix/manifest.scm
View file

@ -517,7 +517,6 @@ inspecting signatures in Mach-O binaries.")
(cond ((string-suffix? "-mingw32" target) (cond ((string-suffix? "-mingw32" target)
(list ;; Native GCC 12 toolchain (list ;; Native GCC 12 toolchain
gcc-toolchain-12 gcc-toolchain-12
(list gcc-toolchain-12 "static")
zip zip
(make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32") (make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32")
nsis-x86_64 nsis-x86_64