brcm2708: fix kmod-sound-soc-bcm2708-i2s config

[openwrt/svn-archive/archive.git] / toolchain / Makefile

diff --git a/toolchain/Makefile b/toolchain/Makefile
index 25f8f4645d6b6f459bbba0fc862e56524aa90c2b..cd5399e041a2d973390a1eeb45b21b57f814148e 100644 (file)
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -9,28 +9,27 @@
 # Steps:
 # 1) toolchain/binutils/install
 #    build & install binutils
-# 2) toolchain/gcc/prepare
+# 2) toolchain/gcc/minimal/install
 #    build & install a minimal gcc, needed for steps 3 & 4
 # 3) toolchain/kernel-headers/install
 #    install kernel headers, needed for step 4
-# 4) toolchain/libc/prepare
+# 4) toolchain/libc/headers/install
 #    build & install libc headers & support files, needed for step 5
-# 5) toolchain/gcc/compile
+# 5) toolchain/gcc/initial/install
 #    build & install an initial gcc, needed for step 6
-# 6) toolchain/libc/compile
+# 6) toolchain/libc/install
 #    build & install the final libc
-# 7) toolchain/gcc/install
+# 7) toolchain/gcc/final/install
 #    build & install the final gcc
-# 8) toolchain/libc/install
+# 8) toolchain/libc/utils/install
 #    build & install libc utilities
 #
 
 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 := $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_INSIGHT),insight) $(if $(CONFIG_EXTERNAL_TOOLCHAIN),wrapper,kernel-headers binutils gcc/minimal gcc/initial gcc/final $(LIBC)/headers $(LIBC) fortify-headers)
 ifdef CONFIG_USE_UCLIBC
-  $(curdir)/builddirs += $(LIBC)/headers
   $(curdir)/builddirs += $(LIBC)/utils
 endif
 $(curdir)/builddirs-compile:=$($(curdir)/builddirs-prepare)
@@ -43,26 +42,13 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
   $(curdir)/gcc/initial/prepare:=$(curdir)/gcc/minimal/prepare
   $(curdir)/gcc/final/prepare:=$(curdir)/gcc/initial/prepare
 
-  ifdef CONFIG_USE_UCLIBC
-    $(curdir)/$(LIBC)/headers/compile:=$(curdir)/kernel-headers/install
-    $(curdir)/gcc/initial/compile:=$(curdir)/$(LIBC)/headers/install
-    $(curdir)/$(LIBC)/compile:=$(curdir)/gcc/initial/install
-    $(curdir)/gcc/final/compile:=$(curdir)/$(LIBC)/install
-    $(curdir)/$(LIBC)/utils/compile:=$(curdir)/gcc/final/install
-    $(curdir)/$(LIBC)/prepare:=$(curdir)/$(LIBC)/headers/prepare
-    $(curdir)/$(LIBC)/utils/prepare:=$(curdir)/$(LIBC)/headers/prepare
-  else
-    $(curdir)/$(LIBC)/prepare:=$(curdir)/kernel-headers/install
-    $(curdir)/$(LIBC)/compile:=$(curdir)/gcc/initial/install
-    $(curdir)/$(LIBC)/install:=$(curdir)/gcc/final/install
-    $(curdir)/gcc/initial/compile:=$(curdir)/$(LIBC)/prepare
-    $(curdir)/gcc/final/compile:=$(curdir)/$(LIBC)/compile
-  endif
-endif
-
-ifdef CONFIG_GCC_VERSION_LLVM
-  $(curdir)/builddirs += llvm
-  $(curdir)/gcc/minimal/compile += $(curdir)/llvm/install
+  $(curdir)/$(LIBC)/headers/compile:=$(curdir)/kernel-headers/install
+  $(curdir)/gcc/initial/compile:=$(curdir)/$(LIBC)/headers/install
+  $(curdir)/$(LIBC)/compile:=$(curdir)/gcc/initial/install
+  $(curdir)/gcc/final/compile:=$(curdir)/$(LIBC)/install
+  $(curdir)/$(LIBC)/utils/compile:=$(curdir)/gcc/final/install
+  $(curdir)/$(LIBC)/prepare:=$(curdir)/$(LIBC)/headers/prepare
+  $(curdir)/$(LIBC)/utils/prepare:=$(curdir)/$(LIBC)/headers/prepare
 endif
 
 ifndef DUMP_TARGET_DB
@@ -72,7 +58,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 $@
@@ -82,7 +69,7 @@ endif
 
 # prerequisites for the individual targets
 $(curdir)/ := .config prereq
-$(curdir)//prepare = $(STAGING_DIR)/.prepared $(TOOLCHAIN_DIR)/info.mk
+$(curdir)//prepare = $(STAGING_DIR)/.prepared $(TOOLCHAIN_DIR)/info.mk $(tools/stamp-install)
 $(curdir)//compile = $(1)/prepare
 $(curdir)//install = $(1)/compile