Skip to content

Commit 05da246

Browse files
committed
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.
1 parent f0794cb commit 05da246

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)