diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | toolchain/gcc/gcc-uclibc-3.x.mk | 4 | ||||
| -rw-r--r-- | toolchain/gcc/gcc-uclibc-4.x.mk | 4 | ||||
| -rw-r--r-- | toolchain/uClibc/uclibc.mk | 6 |
4 files changed, 10 insertions, 6 deletions
@@ -169,7 +169,7 @@ PREFERRED_LIB_FLAGS:=--enable-static --enable-shared # ############################################################## ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) -BASE_TARGETS:=uclibc-configured binutils gcc uclibc-target-utils +BASE_TARGETS:=uclibc-configured binutils cross_compiler uclibc-target-utils else BASE_TARGETS:=uclibc endif diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk index d05de8f4b..bb34797be 100644 --- a/toolchain/gcc/gcc-uclibc-3.x.mk +++ b/toolchain/gcc/gcc-uclibc-3.x.mk @@ -350,7 +350,9 @@ ifeq ($(BR2_INSTALL_LIBGCJ),y) endif touch $@ -gcc: uclibc-configured binutils gcc_initial $(LIBFLOAT_TARGET) uclibc \ +cross_compiler:=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc +cross_compiler gcc: uclibc-configured binutils gcc_initial \ + $(LIBFLOAT_TARGET) uclibc \ $(GCC_BUILD_DIR2)/.installed $(GCC_BUILD_DIR2)/.libs_installed \ $(GCC_TARGETS) diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index 1fd9b11d0..08303ee28 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -357,7 +357,9 @@ ifeq ($(BR2_INSTALL_LIBGCJ),y) endif touch $@ -gcc: uclibc-configured binutils gcc_initial $(LIBFLOAT_TARGET) uclibc \ +cross_compiler:=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc +cross_compiler gcc: uclibc-configured binutils gcc_initial \ + $(LIBFLOAT_TARGET) uclibc \ $(GCC_BUILD_DIR2)/.installed $(GCC_BUILD_DIR2)/.libs_installed \ $(GCC_TARGETS) diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index 0f8e19f17..5a3e54845 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -424,7 +424,7 @@ $(TARGET_DIR)/lib/libc.so.0: $(STAGING_DIR)/usr/lib/libc.a install_runtime touch -c $@ -$(TARGET_DIR)/usr/bin/ldd: $(TARGET_CROSS)gcc +$(TARGET_DIR)/usr/bin/ldd: $(cross_compiler) $(MAKE1) -C $(UCLIBC_DIR) CC=$(TARGET_CROSS)gcc \ CPP=$(TARGET_CROSS)cpp LD=$(TARGET_CROSS)ld \ PREFIX=$(TARGET_DIR) utils install_utils @@ -438,7 +438,7 @@ endif UCLIBC_TARGETS=$(TARGET_DIR)/lib/libc.so.0 endif -uclibc: $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/usr/lib/libc.a $(UCLIBC_TARGETS) +uclibc: $(cross_compiler) $(STAGING_DIR)/usr/lib/libc.a $(UCLIBC_TARGETS) uclibc-source: $(DL_DIR)/$(UCLIBC_SOURCE) @@ -494,7 +494,7 @@ else endif touch -c $@ -uclibc_target: gcc uclibc $(TARGET_DIR)/usr/lib/libc.a $(TARGET_DIR)/usr/bin/ldd +uclibc_target: cross_compiler uclibc $(TARGET_DIR)/usr/lib/libc.a $(TARGET_DIR)/usr/bin/ldd uclibc_target-clean: rm -rf $(TARGET_DIR)/usr/include \ |