aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-09-22 21:38:15 +0000
committerGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-09-22 21:38:15 +0000
commit4909da41569ecf7a974b976646aa13222b0ee8ff (patch)
tree58b26841c198cdf71da5ce5413780bf6f5481599
parent4a52da0f34ce8d1f5267274cad3bd20f40062c78 (diff)
downloadbuildroot-4909da41569ecf7a974b976646aa13222b0ee8ff.tar.gz
buildroot-4909da41569ecf7a974b976646aa13222b0ee8ff.tar.bz2
- rename the gcc base_target to the more appropriate term cross_compiler
-rw-r--r--Makefile2
-rw-r--r--toolchain/gcc/gcc-uclibc-3.x.mk4
-rw-r--r--toolchain/gcc/gcc-uclibc-4.x.mk4
-rw-r--r--toolchain/uClibc/uclibc.mk6
4 files changed, 10 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 5622b54a93..8ce49360cc 100644
--- a/Makefile
+++ b/Makefile
@@ -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 d05de8f4bf..bb34797beb 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 1fd9b11d0f..08303ee28b 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 0f8e19f178..5a3e54845e 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 \