Procházet zdrojové kódy

fix build with ssp enabled

Waldemar Brodkorb před 10 roky
rodič
revize
9c6a7e927a

+ 0 - 5
package/glibc/Makefile

@@ -2,10 +2,6 @@
 # material, please see the LICENCE file in the top-level directory.
 
 include $(TOPDIR)/rules.mk
-
-TARGET_CFLAGS:=		$(filter-out -fstack-protector,$(TARGET_CFLAGS))
-TARGET_CFLAGS:=		$(filter-out -flto,$(TARGET_CFLAGS))
-
 include $(TOPDIR)/toolchain/glibc/Makefile.inc
 
 PKG_NAME:=		glibc
@@ -47,7 +43,6 @@ glibc-static-install:
 	$(CP) $(STAGING_TARGET_DIR)/usr/lib/libc.a $(IDIR_GLIBC_STATIC)/usr/lib
 
 glibc-dev-install:
-	echo $(TARGET_CFLAGS)
 	${INSTALL_DIR} $(IDIR_GLIBC_DEV)/$(ADK_TARGET_LIBC_PATH) $(IDIR_GLIBC_DEV)/usr/lib
 	# install linker script
 	cp ./files/libc.so.$(CPU_ARCH) $(IDIR_GLIBC_DEV)/usr/lib/libc.so

+ 2 - 2
toolchain/glibc/Makefile

@@ -10,8 +10,8 @@ ifneq ($(ADK_DEBUG),)
 TARGET_CFLAGS+=		-O2
 endif
 
-# ssp partially supported
-TARGET_CFLAGS:=		$(filter-out -fstack-protector,$(TARGET_CFLAGS))
+# ssp unsupported
+TARGET_CFLAGS:=		$(filter-out -fstack-protector-all,$(TARGET_CFLAGS))
 
 include Makefile.inc
 include ${TOPDIR}/mk/buildhlp.mk

+ 2 - 0
toolchain/glibc/Makefile.inc

@@ -20,6 +20,8 @@ GLIBC_CONFOPTS:=	--build=$(GNU_HOST_NAME) \
 			--with-tls \
 			--enable-kernel="2.6.32" \
 			--enable-add-ons
+TARGET_CFLAGS:=		$(filter-out -fstack-protector-all,$(TARGET_CFLAGS))
+TARGET_LDFLAGS:=	$(filter-out -fstack-protector-all,$(TARGET_LDFLAGS))
 GLIBC_ENV:=             PATH='${TARGET_PATH}' \
 			CONFIG_SHELL='$(strip ${SHELL})' \
                         BUILD_CC=${CC_FOR_BUILD} \