summaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorManuel Novoa III <mjn3@codepoet.org>2004-09-10 18:58:11 +0000
committerManuel Novoa III <mjn3@codepoet.org>2004-09-10 18:58:11 +0000
commitce1dd7b540443b9b487d082ae34989a8b5a2c032 (patch)
treec464c1c490b61cd68e41e099cdbbe89f4afd24d8 /make
parentcbd2923af712b3dd5615778294c38c79fccfb31c (diff)
Integrate gcc 3.4.2 and add patches from both openembedded (6??-*)
and Dan Kegel's crosstools (7??-*). Use makefile vars for toolchain names in ccache.mk and gdb.mk. Fix a g++-related symlink issue with ccache. Change the default to gcc 3.4.2 and binutils 2.15.91.0.2 (now that mips is building). Let the users go forth and test... ;-)
Diffstat (limited to 'make')
-rw-r--r--make/ccache.mk37
-rw-r--r--make/gdb.mk2
2 files changed, 21 insertions, 18 deletions
diff --git a/make/ccache.mk b/make/ccache.mk
index eea70017f..5cd0d46a4 100644
--- a/make/ccache.mk
+++ b/make/ccache.mk
@@ -51,26 +51,29 @@ $(STAGING_DIR)/$(CCACHE_TARGET_BINARY): $(CCACHE_DIR1)/$(CCACHE_BINARY)
# Otherwise, relative paths for include dirs break.
mkdir -p $(STAGING_DIR)/bin-ccache;
(cd $(STAGING_DIR)/bin-ccache; \
- ln -fs $(OPTIMIZE_FOR_CPU)-linux-uclibc-gcc $(OPTIMIZE_FOR_CPU)-linux-gcc; \
- ln -fs $(OPTIMIZE_FOR_CPU)-linux-uclibc-gcc $(OPTIMIZE_FOR_CPU)-linux-cc; \
- ln -fs $(OPTIMIZE_FOR_CPU)-linux-uclibc-gcc $(OPTIMIZE_FOR_CPU)-linux-uclibc-cc);
- [ -f $(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc-gcc ] && \
- mv $(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc-gcc $(STAGING_DIR)/bin-ccache/
+ ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc; \
+ ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-cc; \
+ ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-cc);
+ [ -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gcc ] && \
+ mv $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/bin-ccache/
(cd $(STAGING_DIR)/bin; \
- ln -fs ../usr/bin/ccache $(OPTIMIZE_FOR_CPU)-linux-cc; \
- ln -fs ../usr/bin/ccache $(OPTIMIZE_FOR_CPU)-linux-gcc; \
- ln -fs ../usr/bin/ccache $(OPTIMIZE_FOR_CPU)-linux-uclibc-cc; \
- ln -fs ../usr/bin/ccache $(OPTIMIZE_FOR_CPU)-linux-uclibc-gcc);
+ ln -fs ../usr/bin/ccache $(GNU_TARGET_NAME)-cc; \
+ ln -fs ../usr/bin/ccache $(GNU_TARGET_NAME)-gcc; \
+ ln -fs ../usr/bin/ccache $(REAL_GNU_TARGET_NAME)-cc; \
+ ln -fs ../usr/bin/ccache $(REAL_GNU_TARGET_NAME)-gcc);
ifeq ($(INSTALL_LIBSTDCPP),true)
- [ -f $(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc-c++ ] && \
- mv $(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc-c++ $(STAGING_DIR)/bin-ccache/
- [ -f $(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc-g++ ] && \
- mv $(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc-g++ $(STAGING_DIR)/bin-ccache/
+ [ -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-c++ ] && \
+ mv $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/bin-ccache/
+ [ -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-g++ ] && \
+ mv $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/bin-ccache/
(cd $(STAGING_DIR)/bin; \
- ln -fs ../usr/bin/ccache $(OPTIMIZE_FOR_CPU)-linux-c++; \
- ln -fs ../usr/bin/ccache $(OPTIMIZE_FOR_CPU)-linux-g++;\
- ln -fs ../usr/bin/ccache $(OPTIMIZE_FOR_CPU)-linux-uclibc-c++; \
- ln -fs ../usr/bin/ccache $(OPTIMIZE_FOR_CPU)-linux-uclibc-g++);
+ ln -fs ../usr/bin/ccache $(GNU_TARGET_NAME)-c++; \
+ ln -fs ../usr/bin/ccache $(GNU_TARGET_NAME)-g++;\
+ ln -fs ../usr/bin/ccache $(REAL_GNU_TARGET_NAME)-c++; \
+ ln -fs ../usr/bin/ccache $(REAL_GNU_TARGET_NAME)-g++);
+ (cd $(STAGING_DIR)/bin-ccache; \
+ ln -fs $(REAL_GNU_TARGET_NAME)-c++ $(GNU_TARGET_NAME)-c++; \
+ ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-g++);
endif
ccache: gcc $(STAGING_DIR)/$(CCACHE_TARGET_BINARY)
diff --git a/make/gdb.mk b/make/gdb.mk
index e1f590f6c..3d01e62d2 100644
--- a/make/gdb.mk
+++ b/make/gdb.mk
@@ -170,7 +170,7 @@ $(GDB_CLIENT_DIR)/gdb/gdb: $(GDB_CLIENT_DIR)/.configured
$(TARGET_CROSS)gdb: $(GDB_CLIENT_DIR)/gdb/gdb
install -c $(GDB_CLIENT_DIR)/gdb/gdb $(TARGET_CROSS)gdb
- ln -s ../../bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc-gdb \
+ ln -s ../../bin/$(REAL_GNU_TARGET_NAME)-gdb \
$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin/gdb
gdbclient: $(TARGET_CROSS)gdb