sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-24 19:42:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge bitcoin#29673: use GCC 11 in macOS build env

Browse Source
This commit is contained in:
Kittywhiskers Van Gogh 2024-03-18 11:03:07 +00:00
parent d570e2d21f
commit f321d3de0c
No known key found for this signature in database
GPG Key ID: 30CD0C065E5C4AAD
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/guix/libexec/build.sh
View File

@ -63,7 +63,6 @@ store_path() {
# Set environment variables to point the NATIVE toolchain to the right # Set environment variables to point the NATIVE toolchain to the right
# includes/libs # includes/libs
NATIVE_GCC="$(store_path gcc-toolchain)" NATIVE_GCC="$(store_path gcc-toolchain)"
NATIVE_GCC_STATIC="$(store_path gcc-toolchain static)"
unset LIBRARY_PATH unset LIBRARY_PATH
unset CPATH unset CPATH
@ -72,12 +71,21 @@ unset CPLUS_INCLUDE_PATH
unset OBJC_INCLUDE_PATH unset OBJC_INCLUDE_PATH
unset OBJCPLUS_INCLUDE_PATH unset OBJCPLUS_INCLUDE_PATH
export LIBRARY_PATH="${NATIVE_GCC}/lib:${NATIVE_GCC_STATIC}/lib"
export C_INCLUDE_PATH="${NATIVE_GCC}/include" export C_INCLUDE_PATH="${NATIVE_GCC}/include"
export CPLUS_INCLUDE_PATH="${NATIVE_GCC}/include/c++:${NATIVE_GCC}/include" export CPLUS_INCLUDE_PATH="${NATIVE_GCC}/include/c++:${NATIVE_GCC}/include"
export OBJC_INCLUDE_PATH="${NATIVE_GCC}/include" 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
*darwin*)
export LIBRARY_PATH="${NATIVE_GCC}/lib"
;;
*)
NATIVE_GCC_STATIC="$(store_path gcc-toolchain static)"
export LIBRARY_PATH="${NATIVE_GCC}/lib:${NATIVE_GCC_STATIC}/lib"
;;
esac
# Set environment variables to point the CROSS toolchain to the right # Set environment variables to point the CROSS toolchain to the right
# includes/libs for $HOST # includes/libs for $HOST
case "$HOST" in case "$HOST" in

5
contrib/guix/manifest.scm
View File

@ -588,9 +588,8 @@ inspecting signatures in Mach-O binaries.")
(list gcc-toolchain-12 "static") (list gcc-toolchain-12 "static")
(make-bitcoin-cross-toolchain target))) (make-bitcoin-cross-toolchain target)))
((string-contains target "darwin") ((string-contains target "darwin")
(list ;; Native GCC 10 toolchain (list ;; Native GCC 11 toolchain
gcc-toolchain-10 gcc-toolchain-11
(list gcc-toolchain-10 "static")
binutils binutils
clang-toolchain-10 clang-toolchain-10
python-signapple python-signapple