diff options
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/binutils/Makefile | 7 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile | 16 | ||||
| -rw-r--r-- | toolchain/uClibc/Makefile | 13 |
3 files changed, 3 insertions, 33 deletions
diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index bb7797e92..fb6beccab 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -6,12 +6,6 @@ include ../rules.mk include Makefile.inc include ${TOPDIR}/mk/buildhlp.mk -ifeq ($(ADK_SSP),y) -CONFOPTS+= --enable-libssp -else -CONFOPTS+= --disable-libssp -endif - ifeq ($(ADK_LINUX_64),y) CONFOPTS+= --enable-64-bit-bfd endif @@ -31,6 +25,7 @@ $(WRKBUILD)/.configured: --disable-dependency-tracking \ --disable-libtool-lock \ --disable-werror \ + --disable-libssp \ ${CONFOPTS} \ ); touch $@ diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index f93691cab..a46e0db49 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -5,13 +5,6 @@ include $(TOPDIR)/rules.mk include ../rules.mk include Makefile.inc - -ifeq ($(ADK_CXX),y) -TARGET_LANGUAGES:= c,c++ -else -TARGET_LANGUAGES:= c -endif - GCC_CONFOPTS= --prefix=$(STAGING_TOOLS) \ --build=$(GNU_HOST_NAME) \ --host=$(GNU_HOST_NAME) \ @@ -26,14 +19,9 @@ GCC_CONFOPTS= --prefix=$(STAGING_TOOLS) \ --disable-biarch \ --disable-multilib \ --disable-sjlj-exceptions \ + --disable-libssp \ --disable-nls -ifeq ($(ADK_SSP),y) -GCC_CONFOPTS+= --enable-libssp -else -GCC_CONFOPTS+= --disable-libssp -endif - ifeq ($(ADK_TARGET_NO_FPU),y) GCC_CONFOPTS+= --with-float=soft endif @@ -108,7 +96,7 @@ $(GCC_BUILD_DIR_FINAL)/.configured: PATH=$(TARGET_PATH) \ $(WRKBUILD)/configure \ ${GCC_CONFOPTS} \ - --enable-languages=$(TARGET_LANGUAGES) \ + --enable-languages=c,c++ \ --with-sysroot=$(STAGING_DIR) \ --with-slibdir=$(STAGING_DIR)/lib \ --enable-shared \ diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index d3e2c7e70..2bca1bb23 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -21,19 +21,6 @@ $(WRKBUILD)/.headers: $(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(WRKBUILD)/Rules.mak sed -e 's^KERNEL_HEADERS.*$$KERNEL_HEADERS=\"${TOOLCHAIN_SYSROOT}/usr/include\"' \ $(TOPDIR)/target/$(ADK_TARGET)/uclibc.config >${WRKBUILD}/.config -ifeq ($(ADK_IPV6),y) - $(SED) 's,# UCLIBC_HAS_IPV6.*,UCLIBC_HAS_IPV6=y,' \ - ${WRKBUILD}/.config -endif -ifeq ($(ADK_SSP),y) - $(SED) 's,# UCLIBC_HAS_SSP.*,UCLIBC_HAS_SSP=y,' \ - ${WRKBUILD}/.config - echo 'UCLIBC_BUILD_SSP=y' >> ${WRKBUILD}/.config - echo '# UCLIBC_HAS_SSP_COMPAT is not set' >> ${WRKBUILD}/.config - echo '# SSP_QUICK_CANARY is not set' >> ${WRKBUILD}/.config - echo 'PROPOLICE_BLOCK_ABRT=y' >> ${WRKBUILD}/.config - echo '# PROPOLICE_BLOCK_SEGV is not set' >> ${WRKBUILD}/.config -endif ifneq ($(ADK_DEBUG),) $(SED) 's,DOSTRIP,DODEBUG,' ${WRKBUILD}/.config endif |