X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=toolchain%2FMakefile;h=0336b2f72cee18fefa66cce218c553b9b99a6e30;hp=0ef0b061f547f864df1986a467b208a013d6cc9a;hb=969d052e960c8d52425442c583003eac3f9f26f6;hpb=334fd4199b94bddd3b17eaa93668e9f04f004ee0

diff --git a/toolchain/Makefile b/toolchain/Makefile
index 0ef0b061f5..0336b2f72c 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -7,47 +7,50 @@
 # Main makefile for the toolchain
 #
 # Steps:
-# 1) toolchain/binutils/install
+# 1) toolchain/binutils/compile
 #    build & install binutils
-# 2) toolchain/gcc/prepare
+# 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/prepare
+# 4) toolchain/libc/headers/compile
 #    build & install libc headers & support files, needed for step 5
-# 5) toolchain/gcc/compile
+# 5) toolchain/gcc/initial/compile
 #    build & install an initial gcc, needed for step 6
 # 6) toolchain/libc/compile
 #    build & install the final libc
-# 7) toolchain/gcc/install
+# 7) toolchain/gcc/final/compile
 #    build & install the final gcc
-# 8) toolchain/libc/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
 
 curdir:=toolchain
 
 # subdirectories to descend into
-$(curdir)/builddirs := $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_INSIGHT),insight) $(if $(CONFIG_EXTERNAL_TOOLCHAIN),wrapper,kernel-headers binutils gcc/minimal gcc/initial gcc/final $(LIBC))
-$(curdir)/builddirs-compile:=$($(curdir)/builddirs-prepare)
-$(curdir)/builddirs-install:=$($(curdir)/builddirs-compile)
+$(curdir)/builddirs := $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_EXTERNAL_TOOLCHAIN),wrapper,kernel-headers binutils gcc/initial gcc/final $(LIBC) fortify-headers) $(if $(CONFIG_NASM),nasm)
+ifdef CONFIG_USE_UCLIBC
+  $(curdir)/builddirs += $(LIBC)/utils
+endif
 
 # builddir dependencies
 ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
-  $(curdir)/$(LIBC)/prepare:=$(curdir)/kernel-headers/install
-  $(curdir)/gcc/minimal/compile:=$(curdir)/binutils/install
-  $(curdir)/kernel-headers/install:=$(curdir)/gcc/minimal/install
-  $(curdir)/gcc/initial/compile:=$(curdir)/$(LIBC)/prepare
-  $(curdir)/gcc/initial/prepare:=$(curdir)/gcc/minimal/prepare
-  $(curdir)/gcc/final/prepare:=$(curdir)/gcc/initial/prepare
-  $(curdir)/$(LIBC)/compile:=$(curdir)/gcc/initial/install
-  $(curdir)/gcc/final/compile:=$(curdir)/$(LIBC)/compile
-  $(curdir)/$(LIBC)/install:=$(curdir)/gcc/final/install
-endif
+  ifdef CONFIG_USE_MUSL
+    $(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/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
 
-ifdef CONFIG_GCC_VERSION_LLVM
-  $(curdir)/builddirs += llvm
-  $(curdir)/gcc/minimal/compile += $(curdir)/llvm/install
+  $(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
 
 ifndef DUMP_TARGET_DB
@@ -57,7 +60,8 @@ ifneq ($(ARCH),)
 		$(if $(QUIET),,set -x;) \
 		mkdir -p "$$dir"; \
 		cd "$$dir"; \
-		ln -sf lib lib64; \
+		ln -nsf lib lib64; \
+		ln -nsf lib lib32; \
 		mkdir -p stamp lib usr/include usr/lib ; \
 	); done
 	@grep GCC_VERSION $@ >/dev/null 2>&1 || $(INSTALL_DATA) $(TOPDIR)/toolchain/info.mk $@
@@ -65,16 +69,31 @@ ifneq ($(ARCH),)
 endif
 endif
 
+ifdef CONFIG_BUILDBOT
+ifneq ($(wildcard $(TOPDIR)/.git),)
+  $(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
+endif
+
 # prerequisites for the individual targets
 $(curdir)/ := .config prereq
-$(curdir)//prepare = $(STAGING_DIR)/.prepared $(TOOLCHAIN_DIR)/info.mk
-$(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)))