From 43c139f131d22ce30caf05c812c58e1f18604fa8 Mon Sep 17 00:00:00 2001
From: Doug Goldstein <cardoe@cardoe.com>
Date: Sun, 4 Dec 2016 23:27:34 -0600
Subject: [PATCH] rust: remove --disable-static only for rust

Only remove --disable-static from OECONF for things built from the rust
source and not things inheriting rust.
---
 classes/rust.bbclass           | 2 --
 recipes-devtools/rust/rust.inc | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/classes/rust.bbclass b/classes/rust.bbclass
index e954825..0790a95 100644
--- a/classes/rust.bbclass
+++ b/classes/rust.bbclass
@@ -38,8 +38,6 @@ HOST_CFLAGS   ?= "${CFLAGS}"
 HOST_CXXFLAGS ?= "${CXXFLAGS}"
 HOST_CPPFLAGS ?= "${CPPFLAGS}"
 
-EXTRA_OECONF_remove = "--disable-static"
-
 rustlib_suffix="${TUNE_ARCH}${TARGET_VENDOR}-${TARGET_OS}/rustlib/${HOST_SYS}/lib"
 # Native sysroot standard library path
 rustlib_src="${prefix}/lib/${rustlib_suffix}"
diff --git a/recipes-devtools/rust/rust.inc b/recipes-devtools/rust/rust.inc
index a608c94..e4ef114 100644
--- a/recipes-devtools/rust/rust.inc
+++ b/recipes-devtools/rust/rust.inc
@@ -341,6 +341,9 @@ do_rust_arch_fixup[dirs] += "${S}/mk/cfg"
 # prevent the rust-installer scripts from calling ldconfig
 export CFG_DISABLE_LDCONFIG="notempty"
 
+# rust's configure doesn't recognize --disable-static, so remove it.
+DISABLE_STATIC = ""
+
 do_configure () {
     # FIXME: target_prefix vs prefix, see cross.bbclass