toolchain/gcc: remove upstreamed patch, add backport

[openwrt/staging/hauke.git] / toolchain / Makefile

diff --git a/toolchain/Makefile b/toolchain/Makefile
index 1199b6174926c583a66d9bdee192dc549f58bd82..5dccf8f82906b58ba1f2c406eb01742a1a9084d2 100644 (file)
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -29,10 +29,7 @@
 curdir:=toolchain
 
 # subdirectories to descend into
-$(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) autoconf-lean
-ifdef CONFIG_USE_UCLIBC
-  $(curdir)/builddirs += $(LIBC)/utils
-endif
+$(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)
 
 # builddir dependencies
 ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
@@ -51,7 +48,6 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
   $(curdir)/$(LIBC)/compile:=$(curdir)/gcc/initial/compile
   $(curdir)/gcc/final/compile:=$(curdir)/$(LIBC)/compile $(curdir)/kernel-headers/compile
   $(curdir)/$(LIBC)/utils/compile:=$(curdir)/gcc/final/compile
-  $(curdir)/autoconf-lean/compile:=$(curdir)/gcc/final/compile
 endif
 
 ifndef DUMP_TARGET_DB