mirrors/meta-rust
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rust: remove --disable-static only for rust

Browse Source 
Only remove --disable-static from OECONF for things built from the rust
source and not things inheriting rust.
This commit is contained in:
Doug Goldstein
2016-12-04 23:27:34 -06:00
parent 487e670b9b
commit 43c139f131
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/rust.bbclass
-2
View File
@@ -38,8 +38,6 @@ HOST_CFLAGS ?= "${CFLAGS}"
HOST_CXXFLAGS ?= "${CXXFLAGS}" HOST_CXXFLAGS ?= "${CXXFLAGS}"
HOST_CPPFLAGS ?= "${CPPFLAGS}" HOST_CPPFLAGS ?= "${CPPFLAGS}"
EXTRA_OECONF_remove = "--disable-static"
rustlib_suffix="${TUNE_ARCH}${TARGET_VENDOR}-${TARGET_OS}/rustlib/${HOST_SYS}/lib" rustlib_suffix="${TUNE_ARCH}${TARGET_VENDOR}-${TARGET_OS}/rustlib/${HOST_SYS}/lib"
# Native sysroot standard library path # Native sysroot standard library path
rustlib_src="${prefix}/lib/${rustlib_suffix}" rustlib_src="${prefix}/lib/${rustlib_suffix}"
recipes-devtools/rust/rust.inc
+3
View File
@@ -341,6 +341,9 @@ do_rust_arch_fixup[dirs] += "${S}/mk/cfg"
# prevent the rust-installer scripts from calling ldconfig # prevent the rust-installer scripts from calling ldconfig
export CFG_DISABLE_LDCONFIG="notempty" export CFG_DISABLE_LDCONFIG="notempty"
# rust's configure doesn't recognize --disable-static, so remove it.
DISABLE_STATIC = ""
do_configure () { do_configure () {
# FIXME: target_prefix vs prefix, see cross.bbclass # FIXME: target_prefix vs prefix, see cross.bbclass