aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2015-06-22 10:31:07 +0000
committerSteven Barth <steven@midlink.org>2015-06-22 10:31:07 +0000
commitf13f59d31b606458ace4432053c12f1e8006d82f (patch)
tree5d92f3ef03e6183fa5cff49627eaf3dabd2f86cd /config
parente1722c400783c9c622ae6eb31e50dbbaab1b0b44 (diff)
downloadmaster-187ad058-f13f59d31b606458ace4432053c12f1e8006d82f.tar.gz
master-187ad058-f13f59d31b606458ace4432053c12f1e8006d82f.tar.bz2
master-187ad058-f13f59d31b606458ace4432053c12f1e8006d82f.zip
gcc/musl: rework SSP-support
Make musl provide libssp_nonshared.a and make GCC link it unconditionally if musl is used. This should be a no-op if SSP is disabled and seems to be the only reliable way of dealing with SSP over all packages due to the mess that is linkerflags handling in packages. Signed-off-by: Steven Barth <steven@midlink.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46108 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'config')
-rw-r--r--config/Config-build.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/Config-build.in b/config/Config-build.in
index 42b8e8e5e3..35c07c63f8 100644
--- a/config/Config-build.in
+++ b/config/Config-build.in
@@ -226,11 +226,11 @@ menu "Global build settings"
bool "None"
config PKG_CC_STACKPROTECTOR_REGULAR
bool "Regular"
- select SSP_SUPPORT
+ select SSP_SUPPORT if !USE_MUSL
depends on KERNEL_CC_STACKPROTECTOR_REGULAR
config PKG_CC_STACKPROTECTOR_STRONG
bool "Strong"
- select SSP_SUPPORT
+ select SSP_SUPPORT if !USE_MUSL
depends on GCC_VERSION_4_9_LINARO
depends on KERNEL_CC_STACKPROTECTOR_STRONG
endchoice