X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/9435e670b41af420f6172b51e4800c91a5fa61c5..8e3dbe3870d77e98309852ab340aa3ccb9aed845:/include/autotools.mk

diff --git a/include/autotools.mk b/include/autotools.mk
index f85026a94..1ddb49b7d 100644
--- a/include/autotools.mk
+++ b/include/autotools.mk
@@ -32,15 +32,13 @@ update_libtool_ucxx = \
 	) \
 	$(call update_libtool_common)
 
+autoconf_bool = $(patsubst %,$(if $($(1)),--enable,--disable)-%,$(2))
 
 # prevent libtool from linking against host development libraries
 define libtool_fixup_libdir
 	find $(1) -name '*.la' | $(XARGS) \
 		$(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" \
-		    -e "s,$(STAGING_DIR)/usr/lib/\(libstdc++\|libsupc++\).la,$(TOOLCHAIN_DIR)/usr/lib/\1.la,g"
-	find $(2) -name '*.la' | $(XARGS) \
-		$(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" \
-		    -e "s,$(STAGING_DIR)/usr/lib/\(libstdc++\|libsupc++\).la,$(TOOLCHAIN_DIR)/usr/lib/\1.la,g"
+		    -e "s,$(STAGING_DIR)/usr/lib/\(libstdc++\|libsupc++\).la,$(TOOLCHAIN_DIR)/lib/\1.la,g"
 endef
 
 define remove_version_check