X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=toolchain%2FMakefile;h=7a9730fd681f3a2f0e385e8966212c246696fae0;hb=70c2c8ff3938d75425d544aac6a7e9966ae6a165;hp=a656a86b0d565eed63a933f8ebe2af26c82d9ca8;hpb=c08651226f5645204f91f79d247801033f6015d1;p=openwrt%2Fopenwrt.git diff --git a/toolchain/Makefile b/toolchain/Makefile index a656a86b0d..7a9730fd68 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -7,21 +7,21 @@ # Main makefile for the toolchain # # Steps: -# 1) toolchain/binutils/install +# 1) toolchain/binutils/compile # build & install binutils -# 2) toolchain/gcc/minimal/install +# 2) toolchain/gcc/minimal/compile # build & install a minimal gcc, needed for steps 3 & 4 -# 3) toolchain/kernel-headers/install +# 3) toolchain/kernel-headers/compile # install kernel headers, needed for step 4 -# 4) toolchain/libc/headers/install +# 4) toolchain/libc/headers/compile # build & install libc headers & support files, needed for step 5 -# 5) toolchain/gcc/initial/install +# 5) toolchain/gcc/initial/compile # build & install an initial gcc, needed for step 6 -# 6) toolchain/libc/install +# 6) toolchain/libc/compile # build & install the final libc -# 7) toolchain/gcc/final/install +# 7) toolchain/gcc/final/compile # build & install the final gcc -# 8) toolchain/libc/utils/install +# 8) toolchain/libc/utils/compile # build & install libc utilities # # For musl, steps 2 and 4 are skipped, and step 3 is done after 5 @@ -37,29 +37,22 @@ endif # builddir dependencies ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) ifdef CONFIG_USE_MUSL - $(curdir)/kernel-headers/compile:=$(curdir)/gcc/initial/install - $(curdir)/$(LIBC)/compile:=$(curdir)/kernel-headers/install + $(curdir)/kernel-headers/compile:=$(curdir)/gcc/initial/compile + $(curdir)/$(LIBC)/compile:=$(curdir)/kernel-headers/compile else $(curdir)/builddirs += $(LIBC)/headers gcc/minimal - $(curdir)/gcc/minimal/compile:=$(curdir)/binutils/install - $(curdir)/kernel-headers/compile:=$(curdir)/gcc/minimal/install - $(curdir)/gcc/initial/prepare:=$(curdir)/gcc/minimal/prepare - $(curdir)/$(LIBC)/prepare:=$(curdir)/$(LIBC)/headers/prepare - $(curdir)/$(LIBC)/headers/compile:=$(curdir)/kernel-headers/install - $(curdir)/gcc/initial/compile:=$(curdir)/$(LIBC)/headers/install + $(curdir)/gcc/minimal/compile:=$(curdir)/binutils/compile + $(curdir)/kernel-headers/compile:=$(curdir)/gcc/minimal/compile + $(curdir)/$(LIBC)/headers/compile:=$(curdir)/kernel-headers/compile + $(curdir)/gcc/initial/compile:=$(curdir)/$(LIBC)/headers/compile endif - $(curdir)/gcc/initial/compile+=$(curdir)/binutils/install - $(curdir)/gcc/final/prepare:=$(curdir)/gcc/initial/prepare - $(curdir)/$(LIBC)/compile:=$(curdir)/gcc/initial/install - $(curdir)/gcc/final/compile:=$(curdir)/$(LIBC)/install - $(curdir)/$(LIBC)/utils/compile:=$(curdir)/gcc/final/install - $(curdir)/$(LIBC)/utils/prepare:=$(curdir)/$(LIBC)/headers/prepare + $(curdir)/gcc/initial/compile+=$(curdir)/binutils/compile + $(curdir)/$(LIBC)/compile:=$(curdir)/gcc/initial/compile + $(curdir)/gcc/final/compile:=$(curdir)/$(LIBC)/compile + $(curdir)/$(LIBC)/utils/compile:=$(curdir)/gcc/final/compile endif -$(curdir)/builddirs-compile:=$($(curdir)/builddirs-prepare) -$(curdir)/builddirs-install:=$($(curdir)/builddirs-compile) - ifndef DUMP_TARGET_DB ifneq ($(ARCH),) $(TOOLCHAIN_DIR)/info.mk: .config @@ -76,16 +69,29 @@ ifneq ($(ARCH),) endif endif +ifdef CONFIG_BUILDBOT + $(TOOLCHAIN_DIR)/stamp/.ver_check: $(TMP_DIR)/.build + cd "$(TOPDIR)"; git log --format=%h -1 toolchain > $(TMP_DIR)/.ver_check + cmp -s $(TMP_DIR)/.ver_check $@ || { \ + rm -rf $(BUILD_DIR) $(STAGING_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR_TOOLCHAIN); \ + mkdir -p $(TOOLCHAIN_DIR)/stamp; \ + mv $(TMP_DIR)/.ver_check $@; \ + } + +$(TOOLCHAIN_DIR)/info.mk $(STAGING_DIR)/.prepared: $(TOOLCHAIN_DIR)/stamp/.ver_check +endif + # prerequisites for the individual targets $(curdir)/ := .config prereq -$(curdir)//prepare = $(STAGING_DIR)/.prepared $(TOOLCHAIN_DIR)/info.mk $(tools/stamp-install) -$(curdir)//compile = $(1)/prepare -$(curdir)//install = $(1)/compile +$(curdir)//compile = $(STAGING_DIR)/.prepared $(TOOLCHAIN_DIR)/info.mk $(tools/stamp-compile) ifndef DUMP_TARGET_DB $(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed: endif -$(eval $(call stampfile,$(curdir),toolchain,install,$(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed,,$(TOOLCHAIN_DIR))) +$(curdir)/install: $(curdir)/compile + +$(eval $(call stampfile,$(curdir),toolchain,compile,$(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed,,$(TOOLCHAIN_DIR))) +$(eval $(call stampfile,$(curdir),toolchain,check,$(TMP_DIR)/.build)) $(eval $(call subdir,$(curdir)))