From: Andre Heider <a.heider@gmail.com>
Date: Tue, 31 Jan 2023 11:04:00 +0000 (+0100)
Subject: toolchain/gcc: use explicit configure args
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4b8b89da506d1272ccbf944b1ece6c8ddaeff2ed;p=openwrt%2Fstaging%2F981213.git

toolchain/gcc: use explicit configure args

Spell out what we want to enable or disable. This prevents host libs to leak in,
so everyone get the same feature set.

Signed-off-by: Andre Heider <a.heider@gmail.com>
---

diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk
index 7eae855eea..5f314c7fc0 100644
--- a/toolchain/gcc/common.mk
+++ b/toolchain/gcc/common.mk
@@ -106,6 +106,8 @@ GCC_CONFIGURE:= \
 			--with-abi=$(call qstrip,$(CONFIG_MIPS64_ABI))) \
 		$(if $(CONFIG_arc),--with-cpu=$(CONFIG_CPU_TYPE)) \
 		$(if $(CONFIG_powerpc64), $(if $(CONFIG_USE_MUSL),--with-abi=elfv2)) \
+		--with-system-zlib=$(STAGING_DIR_HOST) \
+		--without-zstd \
 		--with-gmp=$(STAGING_DIR_HOST) \
 		--with-mpfr=$(STAGING_DIR_HOST) \
 		--with-mpc=$(STAGING_DIR_HOST) \
diff --git a/toolchain/gcc/final/Makefile b/toolchain/gcc/final/Makefile
index 049ddf61f0..78a5576bff 100644
--- a/toolchain/gcc/final/Makefile
+++ b/toolchain/gcc/final/Makefile
@@ -8,6 +8,7 @@ GCC_CONFIGURE += \
 	--enable-shared \
 	--enable-threads \
 	--with-slibdir=$(TOOLCHAIN_DIR)/lib \
+	--enable-plugins \
 	--enable-lto \
 	--with-libelf=$(STAGING_DIR_HOST)