diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-06-23 10:43:19 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-06-23 10:43:19 +0000 |
| commit | f92b2af1fb5be76af723b9278a0bdf40d62db603 (patch) | |
| tree | 085a65a3e339671de4bfad1b89af80b75ee3903c /toolchain | |
| parent | f7a7e2594877225c9356ef3fff1e7cbc0b52a66c (diff) | |
| download | master-187ad058-f92b2af1fb5be76af723b9278a0bdf40d62db603.tar.gz master-187ad058-f92b2af1fb5be76af723b9278a0bdf40d62db603.tar.bz2 master-187ad058-f92b2af1fb5be76af723b9278a0bdf40d62db603.zip | |
uclibc: fix _HAS_SSP replacement regex
A dot was dropped, making it match too much.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46116 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain')
| -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 a4d29c93d5..53a844318b 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 && \ |