cpmac: fix race condition (closes #3019)

[openwrt.git] / toolchain / Makefile

diff --git a/toolchain/Makefile b/toolchain/Makefile
index 3e1b3b4..cbc726e 100644 (file)
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -10,6 +10,8 @@ curdir:=toolchain
 
 # subdirectories to descend into
 $(curdir)/builddirs := kernel-headers $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_NATIVE_TOOLCHAIN),,binutils gcc uClibc)
 
 # subdirectories to descend into
 $(curdir)/builddirs := kernel-headers $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_NATIVE_TOOLCHAIN),,binutils gcc uClibc)

+$(curdir)/builddirs-compile:=. $(filter-out kernel-headers,$($(curdir)/builddirs))
+$(curdir)/builddirs-install:=$($(curdir)/builddirs-compile)

 
 # builddir dependencies
 $(curdir)/uClibc/prepare:=$(curdir)/kernel-headers/prepare
 
 # builddir dependencies
 $(curdir)/uClibc/prepare:=$(curdir)/kernel-headers/prepare


@@ -17,15 +19,28 @@ ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
   $(curdir)/binutils/prepare:=$(curdir)/uClibc/prepare
   $(curdir)/gcc/prepare:=$(curdir)/binutils/install
   $(curdir)/uClibc/compile:=$(curdir)/gcc/compile
   $(curdir)/binutils/prepare:=$(curdir)/uClibc/prepare
   $(curdir)/gcc/prepare:=$(curdir)/binutils/install
   $(curdir)/uClibc/compile:=$(curdir)/gcc/compile

+  $(curdir)/gcc/install:=$(curdir)/uClibc/compile
+  $(curdir)/uClibc/install:=$(curdir)/gcc/install

 endif
 endif

-$(curdir)/gcc/install:=$(curdir)/uClibc/install
+
+$(TOOLCHAIN_DIR)/info.mk: .config
+       @for dir in $(TOOLCHAIN_DIR); do ( \
+               set -x; \
+               mkdir -p "$$dir"; \
+               cd "$$dir"; \
+               mkdir -p bin lib include stamp; \
+       ); done
+       @grep GCC_VERSION $@ >/dev/null 2>&1 || $(INSTALL_DATA) $(TOPDIR)/toolchain/info.mk $@
+       @touch $@

 
 # prerequisites for the individual targets
 
 # prerequisites for the individual targets

-$(curdir)/ := .config $(tools/stamp)
-$(curdir)//prepare = $(STAGING_DIR)/include-host/.done
+$(curdir)/ := .config prereq
+$(curdir)//prepare = $(STAGING_DIR)/.prepared $(TOOLCHAIN_DIR)/info.mk

 $(curdir)//compile = $(1)/prepare
 $(curdir)//install = $(1)/compile
 
 $(curdir)//compile = $(1)/prepare
 $(curdir)//install = $(1)/compile
 

-$(eval $(call stampfile,$(curdir),toolchain))
+$(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed:
+
+$(eval $(call stampfile,$(curdir),toolchain,install,$(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed))

 $(eval $(call subdir,$(curdir)))
 
 $(eval $(call subdir,$(curdir)))