ath9k: fix a locking issue

[openwrt.git] / toolchain / Makefile

diff --git a/toolchain/Makefile b/toolchain/Makefile
index 3d8ba4c..0443924 100644 (file)
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -38,6 +38,8 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
   $(curdir)/gcc/minimal/compile:=$(curdir)/binutils/install
   $(curdir)/kernel-headers/install:=$(curdir)/gcc/minimal/install
   $(curdir)/gcc/initial/compile:=$(curdir)/$(LIBC)/prepare
   $(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
   $(curdir)/$(LIBC)/compile:=$(curdir)/gcc/initial/install
   $(curdir)/gcc/final/compile:=$(curdir)/$(LIBC)/compile
   $(curdir)/$(LIBC)/install:=$(curdir)/gcc/final/install


@@ -51,17 +53,20 @@ ifdef CONFIG_GCC_VERSION_LLVM
   $(curdir)/gcc/minimal/compile += $(curdir)/llvm/install
 endif
 
   $(curdir)/gcc/minimal/compile += $(curdir)/llvm/install
 endif
 

+ifndef DUMP_TARGET_DB

 ifneq ($(ARCH),)
   $(TOOLCHAIN_DIR)/info.mk: .config
        @for dir in $(TOOLCHAIN_DIR); do ( \
 ifneq ($(ARCH),)
   $(TOOLCHAIN_DIR)/info.mk: .config
        @for dir in $(TOOLCHAIN_DIR); do ( \

-               set -x; \
+               $(if $(QUIET),,set -x;) \

                mkdir -p "$$dir"; \
                cd "$$dir"; \
                mkdir -p "$$dir"; \
                cd "$$dir"; \

+               ln -sf lib lib64; \

                mkdir -p stamp lib usr/include usr/lib ; \
        ); done
        @grep GCC_VERSION $@ >/dev/null 2>&1 || $(INSTALL_DATA) $(TOPDIR)/toolchain/info.mk $@
        @touch $@
 endif
                mkdir -p stamp lib usr/include usr/lib ; \
        ); done
        @grep GCC_VERSION $@ >/dev/null 2>&1 || $(INSTALL_DATA) $(TOPDIR)/toolchain/info.mk $@
        @touch $@
 endif

+endif

 
 # prerequisites for the individual targets
 $(curdir)/ := .config prereq
 
 # prerequisites for the individual targets
 $(curdir)/ := .config prereq


@@ -69,7 +74,9 @@ $(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
 

+ifndef DUMP_TARGET_DB

 $(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed:
 $(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed:

+endif

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