uclibc: unbreak after enabling SSP

[openwrt/openwrt.git] / toolchain / uClibc / common.mk

diff --git a/toolchain/uClibc/common.mk b/toolchain/uClibc/common.mk
index 89810a0b9aa6076680c3e5d80f3af84b9e2745bf..a4d29c93d54e3c4d05020d9d43f95ba770666cc7 100644 (file)
--- a/toolchain/uClibc/common.mk
+++ b/toolchain/uClibc/common.mk
@@ -78,7 +78,7 @@ define Host/Configure
                -e 's,^.*UCLIBC_HAS_SHADOW.*,UCLIBC_HAS_SHADOW=$(if $(CONFIG_SHADOW_PASSWORDS),y,n),g' \
                -e 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=$(if $(CONFIG_BUILD_NLS),y,n),g' \
                -e 's,^.*UCLIBC_BUILD_ALL_LOCALE.*,UCLIBC_BUILD_ALL_LOCALE=$(if $(CONFIG_BUILD_NLS),y,n),g' \
-               -e 's,^.*UCLIBC_HAS_SSP.*,UCLIBC_HAS_SSP=$(if $(or $(CONFIG_PKG_CC_STACKPROTECTOR_REGULAR),$(CONFIG_PKG_CC_STACKPROTECTOR_STRONG)),y,n),g' \
+               -e 's,^.*UCLIBC_HAS_SSP[^_]*,UCLIBC_HAS_SSP=$(if $(or $(CONFIG_PKG_CC_STACKPROTECTOR_REGULAR),$(CONFIG_PKG_CC_STACKPROTECTOR_STRONG)),y,n),g' \
                $(HOST_BUILD_DIR)/.config.new
        cmp -s $(HOST_BUILD_DIR)/.config.new $(HOST_BUILD_DIR)/.config.last || { \
                cp $(HOST_BUILD_DIR)/.config.new $(HOST_BUILD_DIR)/.config && \