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() {
61
61
# Set environment variables to point the NATIVE toolchain to the right
62
62
# includes/libs
63
63
NATIVE_GCC=" $( store_path gcc-toolchain) "
64
- NATIVE_GCC_STATIC=" $( store_path gcc-toolchain static) "
65
64
66
65
unset LIBRARY_PATH
67
66
unset CPATH
@@ -70,12 +69,21 @@ unset CPLUS_INCLUDE_PATH
70
69
unset OBJC_INCLUDE_PATH
71
70
unset OBJCPLUS_INCLUDE_PATH
72
71
73
- export LIBRARY_PATH=" ${NATIVE_GCC} /lib:${NATIVE_GCC_STATIC} /lib"
74
72
export C_INCLUDE_PATH=" ${NATIVE_GCC} /include"
75
73
export CPLUS_INCLUDE_PATH=" ${NATIVE_GCC} /include/c++:${NATIVE_GCC} /include"
76
74
export OBJC_INCLUDE_PATH=" ${NATIVE_GCC} /include"
77
75
export OBJCPLUS_INCLUDE_PATH=" ${NATIVE_GCC} /include/c++:${NATIVE_GCC} /include"
78
76
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
+
79
87
# Set environment variables to point the CROSS toolchain to the right
80
88
# includes/libs for $HOST
81
89
case " $HOST " in
Original file line number Diff line number Diff line change @@ -527,9 +527,8 @@ inspecting signatures in Mach-O binaries.")
527
527
(list gcc-toolchain-12 " static" )
528
528
(make-bitcoin-cross-toolchain target)))
529
529
((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
533
532
binutils
534
533
clang-toolchain-17
535
534
cmake-minimal
You can’t perform that action at this time.
0 commit comments