aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorSteven Barth <cyrus@openwrt.org>2015-06-22 10:31:07 +0000
committerSteven Barth <cyrus@openwrt.org>2015-06-22 10:31:07 +0000
commit1877bc9d8f2be143fbe530347a945850d0ecd234 (patch)
treefe99374fe0af943707c608a4112f662b9d8d7aa3 /config
parente0a3d9d1152a05c7c8ba6cd713e394c862ce9252 (diff)
downloadupstream-1877bc9d8f2be143fbe530347a945850d0ecd234.tar.gz
upstream-1877bc9d8f2be143fbe530347a945850d0ecd234.tar.bz2
upstream-1877bc9d8f2be143fbe530347a945850d0ecd234.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> SVN-Revision: 46108
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