sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kittywhiskers Van Gogh 2024-04-04 13:32:15 +01:00
parent f321d3de0c
commit 4d1f7dccd7
No known key found for this signature in database
GPG Key ID: 30CD0C065E5C4AAD
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

@ -77,9 +77,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

@ -576,7 +576,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