File tree Expand file tree Collapse file tree 3 files changed +8
-4
lines changed Expand file tree Collapse file tree 3 files changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -54,6 +54,7 @@ store_path() {
54
54
# Set environment variables to point the NATIVE toolchain to the right
55
55
# includes/libs
56
56
NATIVE_GCC=" $( store_path gcc-toolchain) "
57
+ NATIVE_GCC_STATIC=" $( store_path gcc-toolchain static) "
57
58
58
59
unset LIBRARY_PATH
59
60
unset CPATH
@@ -62,7 +63,7 @@ unset CPLUS_INCLUDE_PATH
62
63
unset OBJC_INCLUDE_PATH
63
64
unset OBJCPLUS_INCLUDE_PATH
64
65
65
- export LIBRARY_PATH=" ${NATIVE_GCC} /lib:${NATIVE_GCC} /lib64"
66
+ export LIBRARY_PATH=" ${NATIVE_GCC} /lib:${NATIVE_GCC} /lib64: ${NATIVE_GCC_STATIC} /lib: ${NATIVE_GCC_STATIC} /lib64 "
66
67
export C_INCLUDE_PATH=" ${NATIVE_GCC} /include"
67
68
export CPLUS_INCLUDE_PATH=" ${NATIVE_GCC} /include/c++:${NATIVE_GCC} /include"
68
69
export OBJC_INCLUDE_PATH=" ${NATIVE_GCC} /include"
@@ -76,8 +77,9 @@ case "$HOST" in
76
77
* darwin* )
77
78
# When targeting darwin, zlib is required by native_libdmg-hfsplus.
78
79
zlib_store_path=$( store_path " zlib" )
80
+ zlib_static_store_path=$( store_path " zlib" static)
79
81
80
- prepend_to_search_env_var LIBRARY_PATH " ${zlib_store_path} /lib"
82
+ prepend_to_search_env_var LIBRARY_PATH " ${zlib_static_store_path} /lib: ${ zlib_store_path} /lib"
81
83
prepend_to_search_env_var C_INCLUDE_PATH " ${zlib_store_path} /include"
82
84
prepend_to_search_env_var CPLUS_INCLUDE_PATH " ${zlib_store_path} /include"
83
85
prepend_to_search_env_var OBJC_INCLUDE_PATH " ${zlib_store_path} /include"
Original file line number Diff line number Diff line change @@ -214,6 +214,7 @@ chain for " target " development."))
214
214
gzip
215
215
xz
216
216
zlib
217
+ (list zlib " static" )
217
218
; ; Build tools
218
219
gnu-make
219
220
libtool
@@ -227,7 +228,8 @@ chain for " target " development."))
227
228
; ; Git
228
229
git
229
230
; ; Native gcc 7 toolchain
230
- gcc-toolchain-7)
231
+ gcc-toolchain-7
232
+ (list gcc-toolchain-7 " static" ))
231
233
(let ((target (getenv " HOST" )))
232
234
(cond ((string-suffix? " -mingw32" target)
233
235
; ; Windows
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ define $(package)_preprocess_cmds
12
12
endef
13
13
14
14
define $(package)_config_cmds
15
- $($(package ) _cmake) -DCMAKE_C_FLAGS="$$($(1 ) _cflags) -Wl,--build-id=none" -DCMAKE_SKIP_RPATH="ON" ..
15
+ $($(package ) _cmake) -DCMAKE_C_FLAGS="$$($(1 ) _cflags) -Wl,--build-id=none" -DCMAKE_SKIP_RPATH="ON" -DCMAKE_EXE_LINKER_FLAGS="-static" -DCMAKE_FIND_LIBRARY_SUFFIXES=".a" ..
16
16
endef
17
17
18
18
define $(package)_build_cmds
You can’t perform that action at this time.
0 commit comments