Skip to content

Commit 5c10d12

Browse files
committed
Merge bitcoin/bitcoin#29828: guix: remove gcc-toolchain static from Windows build
05da246 guix: remove gcc-toolchain static from Windows build (fanquake) Pull request description: The libs in this dir are the following: ```bash ls /gnu/store/2vnbkrdin4rrf7ygnr80mlcglin4qqa4-gcc-toolchain-12.3.0-static/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. Guix Build (aarch64): ```bash 450c0c4f45f9cb7ed7fc2ef6e7557b6a23004b82c951399da3b7635e8451a076 guix-build-05da2460db89/output/dist-archive/bitcoin-05da2460db89.tar.gz 5df68ab18636090c387bc90297356d0e148b02931d3a99c0f6d33cd268aa072b guix-build-05da2460db89/output/x86_64-w64-mingw32/SHA256SUMS.part 13e979f60d9296aa11081fbbb360404da9fbb797bb4663ed2d1189d800659b4f guix-build-05da2460db89/output/x86_64-w64-mingw32/bitcoin-05da2460db89-win64-debug.zip d1cc78437a96f012a59af7c757bef592f163559e523d45014d7804d0be29a8b8 guix-build-05da2460db89/output/x86_64-w64-mingw32/bitcoin-05da2460db89-win64-setup-unsigned.exe 33a9cfd4475677646bb32c9c45c25bd796ca5adb126590bf556d4e6f9592c676 guix-build-05da2460db89/output/x86_64-w64-mingw32/bitcoin-05da2460db89-win64-unsigned.tar.gz 5d2ee251668d3d31bf378826ab06f98542dd20926cdee2df5c3315e11222a519 guix-build-05da2460db89/output/x86_64-w64-mingw32/bitcoin-05da2460db89-win64.zip ``` Somewhat similar to #29673. ACKs for top commit: laanwj: ACK 05da246 hebasto: ACK 05da246, Tree-SHA512: bf514a726a22e2bfae4de645b10d90a66fe090971340c4299aeb9b2ff9cf536ca6cfed274d312ea5d5a172775cbda6db0e609492ec603f5aee55c8de81462cc0
2 parents 312f542 + 05da246 commit 5c10d12

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

contrib/guix/libexec/build.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,8 @@ export OBJC_INCLUDE_PATH="${NATIVE_GCC}/include"
7575
export OBJCPLUS_INCLUDE_PATH="${NATIVE_GCC}/include/c++:${NATIVE_GCC}/include"
7676

7777
case "$HOST" in
78-
*darwin*)
79-
export LIBRARY_PATH="${NATIVE_GCC}/lib"
80-
;;
78+
*darwin*) export LIBRARY_PATH="${NATIVE_GCC}/lib" ;;
79+
*mingw*) export LIBRARY_PATH="${NATIVE_GCC}/lib" ;;
8180
*)
8281
NATIVE_GCC_STATIC="$(store_path gcc-toolchain static)"
8382
export LIBRARY_PATH="${NATIVE_GCC}/lib:${NATIVE_GCC_STATIC}/lib"

contrib/guix/manifest.scm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,6 @@ inspecting signatures in Mach-O binaries.")
517517
(cond ((string-suffix? "-mingw32" target)
518518
(list ;; Native GCC 12 toolchain
519519
gcc-toolchain-12
520-
(list gcc-toolchain-12 "static")
521520
zip
522521
(make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32")
523522
nsis-x86_64

0 commit comments

Comments
 (0)