From 1877bc9d8f2be143fbe530347a945850d0ecd234 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Mon, 22 Jun 2015 10:31:07 +0000 Subject: 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 SVN-Revision: 46108 --- include/package-defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/package-defaults.mk') diff --git a/include/package-defaults.mk b/include/package-defaults.mk index a5e9fbe..2896b4c 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))) -- cgit v1.1