diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-07-27 22:43:04 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-07-27 22:43:04 +0200 |
| commit | f806d3430c6fae4890610be58ca561bda07f551a (patch) | |
| tree | 5391e0bb9e7207d7d19c02759cca76c3b16b2177 | |
| parent | c43f21339e9417b5f6939e04e02089b445581102 (diff) | |
| parent | fed6a2a6ea884630a3723d2a49579e63e87ffd57 (diff) | |
| download | buildroot-novena-f806d3430c6fae4890610be58ca561bda07f551a.tar.gz buildroot-novena-f806d3430c6fae4890610be58ca561bda07f551a.zip | |
Merge branch 'fix-gcc-on-target' of git://git.busybox.net/~tpetazzoni/git/buildroot
| -rw-r--r-- | toolchain/gcc/Makefile.in | 5 | ||||
| -rw-r--r-- | toolchain/gcc/gcc-uclibc-4.x.mk | 19 |
2 files changed, 9 insertions, 15 deletions
diff --git a/toolchain/gcc/Makefile.in b/toolchain/gcc/Makefile.in index 0dcd8035e..4278bdbcf 100644 --- a/toolchain/gcc/Makefile.in +++ b/toolchain/gcc/Makefile.in @@ -50,11 +50,6 @@ EXTRA_GCC_CONFIG_OPTIONS+=--with-build-time-tools=$(STAGING_DIR)/$(REAL_GNU_TARG #EXTRA_GCC_CONFIG_OPTIONS+=--with-as=$(TARGET_CROSS)as endif -TARGET_GCC_FLAGS= CFLAGS_FOR_TARGET="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \ - CXXFLAGS_FOR_TARGET="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \ - CFLAGS="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \ - BOOT_CFLAGS="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" - ifeq ($(BR2_PACKAGE_GCC_TARGET),y) EXTRA_TARGET_GCC_CONFIG_OPTIONS:= diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index 081e906c8..9720ed39b 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -393,7 +393,12 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.prepared (cd $(GCC_BUILD_DIR3); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ - $(TARGET_GCC_FLAGS) \ + CFLAGS_FOR_TARGET="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \ + CXXFLAGS_FOR_TARGET="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \ + CFLAGS="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \ + BOOT_CFLAGS="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \ + GCC_FOR_TARGET="$(TARGET_CC)" \ + CC_FOR_TARGET="$(TARGET_CC)" \ $(GCC_SRC_DIR)/configure $(QUIET) \ --prefix=/usr \ --build=$(GNU_HOST_NAME) \ @@ -440,15 +445,9 @@ $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR3)/.compiled # Remove broken specs file (cross compile flag is set). rm -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/specs - -(cd $(TARGET_DIR)/bin && find -type f | xargs $(STRIPCMD) > /dev/null 2>&1) - -(cd $(TARGET_DIR)/usr/bin && find -type f | xargs $(STRIPCMD) > /dev/null 2>&1) - -(cd $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR) && $(STRIPCMD) cc1 cc1plus collect2 > /dev/null 2>&1) - -(cd $(TARGET_DIR)/usr/lib && $(STRIPCMD) libstdc++.so.*.*.* > /dev/null 2>&1) - -(cd $(TARGET_DIR)/lib && $(STRIPCMD) libgcc_s*.so.*.*.* > /dev/null 2>&1) - # - rm -f $(TARGET_DIR)/usr/lib/*.la* - #rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ - # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc + # Remove useless copies of gcc + rm -f $(TARGET_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc* + # Work around problem of missing syslimits.h if [ ! -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/$(GCC_INCLUDE_DIR)/syslimits.h ]; then \ echo "warning: working around missing syslimits.h"; \ |