uclibc++: honor ldflags, disable SSP
Signed-off-by: Steven Barth <steven@midlink.org> SVN-Revision: 46066
This commit is contained in:
parent
4d548dce67
commit
38da12f7e4
2 changed files with 27 additions and 3 deletions
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=uclibc++
|
||||
PKG_VERSION:=0.2.4
|
||||
PKG_RELEASE:=1
|
||||
PKG_RELEASE:=2
|
||||
|
||||
PKG_SOURCE:=uClibc++-$(PKG_VERSION).tar.bz2
|
||||
PKG_SOURCE_URL:=http://cxx.uclibc.org/src/
|
||||
|
@ -44,7 +44,7 @@ UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
|
|||
-e 's/mipsel.*/mips/' \
|
||||
)
|
||||
|
||||
TARGET_CFLAGS += $(FPIC)
|
||||
TARGET_CFLAGS += $(FPIC) -fno-stack-protector
|
||||
|
||||
ifneq ($(CONFIG_CCACHE),)
|
||||
TARGET_CXX=$(TARGET_CXX_NOCACHE)
|
||||
|
@ -55,8 +55,9 @@ MAKE_FLAGS:= \
|
|||
$(TARGET_CONFIGURE_OPTS) \
|
||||
CPU_CFLAGS="$(TARGET_CFLAGS)" \
|
||||
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)" \
|
||||
GEN_LIBS="-lc $(LIBGCC_S) -lssp" \
|
||||
check_as_needed=
|
||||
|
||||
# check_as_needed overrides dependency on libgcc_s
|
||||
|
|
23
package/libs/uclibc++/patches/010-honor-ldflags.patch
Normal file
23
package/libs/uclibc++/patches/010-honor-ldflags.patch
Normal file
|
@ -0,0 +1,23 @@
|
|||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -3,9 +3,9 @@ include $(TOPDIR)Rules.mak
|
||||
|
||||
WR_CXX := WRAPPER_INCLUDEDIR=-I$(TOPDIR)include $(TOPDIR)bin/g++-uc
|
||||
|
||||
-LDFLAGS += -nodefaultlibs -shared -Wl,-soname,$(SHARED_MAJORNAME) $(BUILD_EXTRA_LIBRARIES)
|
||||
+EXTRA_LDFLAGS += -nodefaultlibs -shared -Wl,-soname,$(SHARED_MAJORNAME) $(BUILD_EXTRA_LIBRARIES)
|
||||
ifneq ($(DODEBUG),y)
|
||||
-LDFLAGS += -Wl,-s
|
||||
+EXTRA_LDFLAGS += -Wl,-s
|
||||
endif
|
||||
|
||||
SRCS = $(wildcard *.cpp)
|
||||
@@ -60,7 +60,7 @@ $(LIBNAME).a: libgcc_eh libsupc $(EXOBJS
|
||||
$(RANLIB) $@
|
||||
|
||||
$(SHARED_FULLNAME): libgcc_eh libsupc $(EXOBJS)
|
||||
- $(CC) $(LDFLAGS) -o $@ $(EXOBJS) $(SUPOBJS) $(GCCOBJS) $(LIBS)
|
||||
+ $(CC) $(LDFLAGS) $(EXTRA_LDFLAGS) -o $@ $(EXOBJS) $(SUPOBJS) $(GCCOBJS) $(LIBS)
|
||||
$(LN) $@ $(SHARED_MAJORNAME)
|
||||
$(LN) $(SHARED_MAJORNAME) $(LIBNAME).so
|
||||
|
Loading…
Reference in a new issue