diff options
author | Steven Barth <steven@midlink.org> | 2015-06-18 09:49:45 +0000 |
---|---|---|
committer | Steven Barth <steven@midlink.org> | 2015-06-18 09:49:45 +0000 |
commit | 2598d40f27a4de4c57472ff3372a3ad165356334 (patch) | |
tree | 370742906c6a768c1995a2ed0cd384a27cb37416 /toolchain/uClibc/common.mk | |
parent | 6fcccabb54121f488ed68514dc71174bd3c82ef4 (diff) | |
download | master-187ad058-2598d40f27a4de4c57472ff3372a3ad165356334.tar.gz master-187ad058-2598d40f27a4de4c57472ff3372a3ad165356334.tar.bz2 master-187ad058-2598d40f27a4de4c57472ff3372a3ad165356334.zip |
uclibc: unbreak after enabling SSP
Signed-off-by: Steven Barth <steven@midlink.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46034 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/uClibc/common.mk')
-rw-r--r-- | toolchain/uClibc/common.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toolchain/uClibc/common.mk b/toolchain/uClibc/common.mk index 89810a0b9a..a4d29c93d5 100644 --- 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 && \ |