From c3caa1b768728fc9daf833c55f846d6bc2362efb Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 30 Jun 2012 21:44:05 +0000
Subject: uClibc: split the package into the main directory and the headers/
 and utils/ subdirectories to clean up build order and fix quilt support

SVN-Revision: 32557
---
 toolchain/Makefile | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'toolchain/Makefile')

diff --git a/toolchain/Makefile b/toolchain/Makefile
index 0ef0b061f5..e16b4d9e9e 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -29,6 +29,10 @@ 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))
+ifdef CONFIG_USE_UCLIBC
+  $(curdir)/builddirs += $(LIBC)/headers
+  $(curdir)/builddirs += $(LIBC)/utils
+endif
 $(curdir)/builddirs-compile:=$($(curdir)/builddirs-prepare)
 $(curdir)/builddirs-install:=$($(curdir)/builddirs-compile)
 
@@ -37,12 +41,22 @@ 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
+
+  ifdef CONFIG_USE_UCLIBC
+    $(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)/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
-- 
cgit v1.2.3