diff options
| author | Steven Barth <steven@midlink.org> | 2015-06-22 10:31:07 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2015-06-22 10:31:07 +0000 |
| commit | f13f59d31b606458ace4432053c12f1e8006d82f (patch) | |
| tree | 5d92f3ef03e6183fa5cff49627eaf3dabd2f86cd /include/package-defaults.mk | |
| parent | e1722c400783c9c622ae6eb31e50dbbaab1b0b44 (diff) | |
| download | master-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 'include/package-defaults.mk')
| -rw-r--r-- | include/package-defaults.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/package-defaults.mk b/include/package-defaults.mk index a5e9fbe915..2896b4c783 100644 --- a/include/package-defaults.mk +++ b/include/package-defaults.mk @@ -5,7 +5,7 @@ # See /LICENSE for more information. # -PKG_DEFAULT_DEPENDS = +libc +(SSP_SUPPORT&&!USE_MUSL):libssp +USE_GLIBC:librt +USE_GLIBC:libpthread +PKG_DEFAULT_DEPENDS = +libc +SSP_SUPPORT:libssp +USE_GLIBC:librt +USE_GLIBC:libpthread ifneq ($(PKG_NAME),toolchain) PKG_FIXUP_DEPENDS = $(if $(filter kmod-%,$(1)),$(2),$(PKG_DEFAULT_DEPENDS) $(filter-out $(PKG_DEFAULT_DEPENDS),$(2))) |