File tree Expand file tree Collapse file tree 2 files changed +12
-5
lines changed Expand file tree Collapse file tree 2 files changed +12
-5
lines changed Original file line number Diff line number Diff line change @@ -61,7 +61,6 @@ store_path() {
6161# Set environment variables to point the NATIVE toolchain to the right
6262# includes/libs
6363NATIVE_GCC=" $( store_path gcc-toolchain) "
64- NATIVE_GCC_STATIC=" $( store_path gcc-toolchain static) "
6564
6665unset LIBRARY_PATH
6766unset CPATH
@@ -70,12 +69,21 @@ unset CPLUS_INCLUDE_PATH
7069unset OBJC_INCLUDE_PATH
7170unset OBJCPLUS_INCLUDE_PATH
7271
73- export LIBRARY_PATH=" ${NATIVE_GCC} /lib:${NATIVE_GCC_STATIC} /lib"
7472export C_INCLUDE_PATH=" ${NATIVE_GCC} /include"
7573export CPLUS_INCLUDE_PATH=" ${NATIVE_GCC} /include/c++:${NATIVE_GCC} /include"
7674export OBJC_INCLUDE_PATH=" ${NATIVE_GCC} /include"
7775export OBJCPLUS_INCLUDE_PATH=" ${NATIVE_GCC} /include/c++:${NATIVE_GCC} /include"
7876
77+ case " $HOST " in
78+ * darwin* )
79+ export LIBRARY_PATH=" ${NATIVE_GCC} /lib"
80+ ;;
81+ * )
82+ NATIVE_GCC_STATIC=" $( store_path gcc-toolchain static) "
83+ export LIBRARY_PATH=" ${NATIVE_GCC} /lib:${NATIVE_GCC_STATIC} /lib"
84+ ;;
85+ esac
86+
7987# Set environment variables to point the CROSS toolchain to the right
8088# includes/libs for $HOST
8189case " $HOST " in
Original file line number Diff line number Diff line change @@ -527,9 +527,8 @@ inspecting signatures in Mach-O binaries.")
527527 (list gcc-toolchain-12 " static" )
528528 (make-bitcoin-cross-toolchain target)))
529529 ((string-contains target " darwin" )
530- (list ; ; Native GCC 10 toolchain
531- gcc-toolchain-10
532- (list gcc-toolchain-10 " static" )
530+ (list ; ; Native GCC 11 toolchain
531+ gcc-toolchain-11
533532 binutils
534533 clang-toolchain-17
535534 cmake-minimal
You can’t perform that action at this time.
0 commit comments