From: Steven Barth <cyrus@openwrt.org>
Date: Sat, 20 Jun 2015 18:36:52 +0000 (+0000)
Subject: uclibc++: link against libssp_nonshared instead of libssp
X-Git-Tag: reboot~2711
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=933b588e25556319fc762aca09d60f6b87d7a943;p=openwrt%2Fstaging%2Fpepe2k.git

uclibc++: link against libssp_nonshared instead of libssp

Signed-off-by: Steven Barth <steven@midlink.org>

SVN-Revision: 46076
---

diff --git a/package/libs/uclibc++/Makefile b/package/libs/uclibc++/Makefile
index 8374db5322..3e9fd73c26 100644
--- a/package/libs/uclibc++/Makefile
+++ b/package/libs/uclibc++/Makefile
@@ -44,10 +44,6 @@ UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
 	-e 's/mipsel.*/mips/' \
 )
 
-ifeq ($(ARCH),powerpc)
-TARGET_CFLAGS += -fno-stack-protector
-endif
-
 TARGET_CFLAGS += $(FPIC)
 
 ifneq ($(CONFIG_CCACHE),)
@@ -61,7 +57,7 @@ MAKE_FLAGS:= \
 	CROSS="$(TARGET_CROSS)" \
 	LDFLAGS="-Wl,--warn-common -Wl,--warn-once -Wl,-z,combreloc -Wl,-z,defs $(TARGET_LDFLAGS)" \
 	CP="$(CP)" \
-	GEN_LIBS="-lc $(LIBGCC_S) -lssp" \
+	GEN_LIBS="-lc $(LIBGCC_S) -lssp_nonshared" \
 	check_as_needed=
 
 # check_as_needed overrides dependency on libgcc_s