From: Steven Barth Date: Mon, 6 Jul 2015 08:55:28 +0000 (+0000) Subject: uclibc++: link libssp_nonshared only for musl X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f3cacb9e84;p=librecmc%2Flibrecmc.git uclibc++: link libssp_nonshared only for musl Signed-off-by: Steven Barth SVN-Revision: 46192 --- diff --git a/package/libs/uclibc++/Makefile b/package/libs/uclibc++/Makefile index bad6d6d353..3aa94f8350 100644 --- a/package/libs/uclibc++/Makefile +++ b/package/libs/uclibc++/Makefile @@ -50,6 +50,10 @@ ifneq ($(CONFIG_CCACHE),) TARGET_CXX=$(TARGET_CXX_NOCACHE) endif +ifeq ($(CONFIG_USE_MUSL),y) +SSP_LIB=-lssp_nonshared +endif + MAKE_FLAGS:= \ TOPDIR="$(PKG_BUILD_DIR)/" \ $(TARGET_CONFIGURE_OPTS) \ @@ -57,7 +61,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_nonshared" \ + GEN_LIBS="-lc $(LIBGCC_S) $(SSP_LIB)" \ check_as_needed= # check_as_needed overrides dependency on libgcc_s