diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/gcc-3.3.mk | 5 | ||||
| -rw-r--r-- | make/uclibc.mk | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/make/gcc-3.3.mk b/make/gcc-3.3.mk index ae201b01e..f77a6c0cb 100644 --- a/make/gcc-3.3.mk +++ b/make/gcc-3.3.mk @@ -298,8 +298,8 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.gcc3_3_build_hacks (cd $(GCC_BUILD_DIR3); ln -fs $(ARCH)-linux build-$(GNU_TARGET_NAME)) (cd $(GCC_BUILD_DIR3); \ $(TARGET_CONFIGURE_OPTS) \ - CC_FOR_BUILD=$(TARGET_CROSS)gcc \ - CXX_FOR_BUILD=$(TARGET_CROSS)g++ \ + CC_FOR_BUILD=$(HOSTCC) \ + CXX_FOR_BUILD=$(HOSTCC) \ AR_FOR_TARGET=$(TARGET_CROSS)ar \ AS_FOR_TARGET=$(TARGET_CROSS)as \ LD_FOR_TARGET=$(TARGET_CROSS)ld \ @@ -326,6 +326,7 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.gcc3_3_build_hacks --disable-shared $(MULTILIB) \ --enable-target-optspace $(DISABLE_NLS) \ --with-gnu-ld --disable-__cxa_atexit \ + --enable-clocale=gnu \ --enable-languages=$(TARGET_LANGUAGES) \ $(EXTRA_GCC_CONFIG_OPTIONS) \ --program-prefix="" \ diff --git a/make/uclibc.mk b/make/uclibc.mk index 4934b0a0b..92577ed23 100644 --- a/make/uclibc.mk +++ b/make/uclibc.mk @@ -111,7 +111,15 @@ $(TARGET_DIR)/usr/lib/libc.a: $(STAGING_DIR)/lib/libc.a ln -fs /lib/libnsl.so.0 libnsl.so; \ ) -uclibc_target: gcc_final uclibc $(TARGET_DIR)/usr/lib/libc.a +ifeq ($(USE_UCLIBC_TOOLCHAIN),true) +ifeq ($(GCC_2_95_TOOLCHAIN),true) +uclibc_target: gcc2_95 uclibc $(TARGET_DIR)/usr/lib/libc.a +else +uclibc_target: gcc3_3 uclibc $(TARGET_DIR)/usr/lib/libc.a +endif +else +uclibc_target: uclibc $(TARGET_DIR)/usr/lib/libc.a +endif uclibc_target-clean: rm -f $(TARGET_DIR)/include |