From adba6489023933b548eba81d7794047d4d7d20f2 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Fri, 9 Apr 2004 09:36:26 +0000 Subject: support ccache for the build as well as the target --- Makefile | 4 +-- make/ccache.mk | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 83 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 63e751df4..5a901365f 100644 --- a/Makefile +++ b/Makefile @@ -129,9 +129,9 @@ INSTALL_LIBGCJ:=false TARGETS:=host-sed ifeq ($(GCC_2_95_TOOLCHAIN),true) -TARGETS+=uclibc-configured binutils gcc2_95 +TARGETS+=uclibc-configured binutils gcc2_95 ccache else -TARGETS+=uclibc-configured binutils gcc3_3 +TARGETS+=uclibc-configured binutils gcc3_3 ccache endif # Do you want user mode Linux (x86 only), or are you building a diff --git a/make/ccache.mk b/make/ccache.mk index 9ee98db65..c3703183e 100644 --- a/make/ccache.mk +++ b/make/ccache.mk @@ -6,27 +6,100 @@ CCACHE_SITE:=http://ccache.samba.org/ftp/ccache CCACHE_SOURCE:=ccache-2.3.tar.gz CCACHE_DIR:=$(TOOL_BUILD_DIR)/ccache-2.3 -CCACHE_DIR2:=$(BUILD_DIR)/ccache-2.3 +CCACHE_DIR1:=$(TOOL_BUILD_DIR)/ccache-host +CCACHE_DIR2:=$(BUILD_DIR)/ccache-target CCACHE_CAT:=zcat CCACHE_BINARY:=ccache CCACHE_TARGET_BINARY:=usr/bin/ccache -CCACHE_DIR1:=$(TOOL_BUILD_DIR)/ccache-build $(DL_DIR)/$(CCACHE_SOURCE): $(WGET) -P $(DL_DIR) $(CCACHE_SITE)/$(CCACHE_SOURCE) -$(CCACHE_DIR)/.unpacked: $(DL_DIR)/$(CCACHE_SOURCE) +$(CCACHE_DIR1)/.unpacked: $(DL_DIR)/$(CCACHE_SOURCE) $(CCACHE_CAT) $(DL_DIR)/$(CCACHE_SOURCE) | tar -C $(TOOL_BUILD_DIR) -xvf - - touch $(CCACHE_DIR)/.unpacked + mv $(CCACHE_DIR) $(CCACHE_DIR1) + touch $(CCACHE_DIR1)/.unpacked -$(CCACHE_DIR)/.patched: $(CCACHE_DIR)/.unpacked - touch $(CCACHE_DIR)/.patched +$(CCACHE_DIR1)/.patched: $(CCACHE_DIR1)/.unpacked + $(SED) "s,getenv(\"CCACHE_PATH\"),\"$(STAGING_DIR)/usr/bin\",g" \ + $(CCACHE_DIR1)/execute.c + $(SED) "s,getenv(\"CCACHE_DIR\"),\"$(CCACHE_DIR1)\",g" \ + $(CCACHE_DIR1)/ccache.c + touch $(CCACHE_DIR1)/.patched -$(CCACHE_DIR2)/.configured: $(CCACHE_DIR)/.patched +$(CCACHE_DIR1)/.configured: $(CCACHE_DIR1)/.patched + mkdir -p $(CCACHE_DIR1) + (cd $(CCACHE_DIR1); rm -rf config.cache; \ + CC=$(HOSTCC) \ + $(CCACHE_DIR1)/configure \ + --target=$(GNU_HOST_NAME) \ + --host=$(GNU_HOST_NAME) \ + --build=$(GNU_HOST_NAME) \ + --prefix=/usr \ + ); + touch $(CCACHE_DIR1)/.configured + +$(CCACHE_DIR1)/$(CCACHE_BINARY): $(CCACHE_DIR1)/.configured + $(MAKE) CC=$(HOSTCC) -C $(CCACHE_DIR1) + +$(STAGING_DIR)/$(CCACHE_TARGET_BINARY): $(CCACHE_DIR1)/$(CCACHE_BINARY) + mkdir -p $(STAGING_DIR)/usr/bin; + mkdir -p $(TOOL_BUILD_DIR)/.ccache; + cp $(CCACHE_DIR1)/ccache $(STAGING_DIR)/usr/bin + (cd $(STAGING_DIR)/usr/bin; \ + ln -fs $(ARCH)-linux-uclibc-gcc $(ARCH)-linux-cc; \ + ln -fs $(ARCH)-linux-uclibc-gcc $(ARCH)-linux-uclibc-cc); + [ -f $(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-gcc ] && \ + mv $(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-gcc $(STAGING_DIR)/usr/bin/ + [ -f $(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-c++ ] && \ + mv $(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-c++ $(STAGING_DIR)/usr/bin/ + [ -f $(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-g++ ] && \ + mv $(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-g++ $(STAGING_DIR)/usr/bin/ + (cd $(STAGING_DIR)/bin; \ + ln -fs ../usr/bin/ccache $(ARCH)-linux-cc; \ + ln -fs ../usr/bin/ccache $(ARCH)-linux-gcc; \ + ln -fs ../usr/bin/ccache $(ARCH)-linux-c++; \ + ln -fs ../usr/bin/ccache $(ARCH)-linux-g++;\ + ln -fs ../usr/bin/ccache $(ARCH)-linux-uclibc-cc; \ + ln -fs ../usr/bin/ccache $(ARCH)-linux-uclibc-gcc; \ + ln -fs ../usr/bin/ccache $(ARCH)-linux-uclibc-c++; \ + ln -fs ../usr/bin/ccache $(ARCH)-linux-uclibc-g++); + +ifeq ($(GCC_2_95_TOOLCHAIN),true) +ccache: gcc2_95 $(STAGING_DIR)/$(CCACHE_TARGET_BINARY) +else +ccache: gcc3_3 $(STAGING_DIR)/$(CCACHE_TARGET_BINARY) +endif + +ccache-clean: + $(MAKE) -C $(CCACHE_DIR1) uninstall + -$(MAKE) -C $(CCACHE_DIR1) clean + +ccache-dirclean: + rm -rf $(CCACHE_DIR1) + + + + +############################################################# +# +# build ccache for use on the target system +# +############################################################# + +$(CCACHE_DIR2)/.unpacked: $(DL_DIR)/$(CCACHE_SOURCE) + $(CCACHE_CAT) $(DL_DIR)/$(CCACHE_SOURCE) | tar -C $(BUILD_DIR) -xvf - + mv $(CCACHE_DIR) $(CCACHE_DIR2) + touch $(CCACHE_DIR2)/.unpacked + +$(CCACHE_DIR2)/.patched: $(CCACHE_DIR2)/.unpacked + touch $(CCACHE_DIR2)/.patched + +$(CCACHE_DIR2)/.configured: $(CCACHE_DIR2)/.patched mkdir -p $(CCACHE_DIR2) (cd $(CCACHE_DIR2); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - $(CCACHE_DIR)/configure \ + $(CCACHE_DIR2)/configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ -- cgit v1.2.3