summaryrefslogtreecommitdiffstats
path: root/toolchain/Makefile
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-06-30 21:44:05 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-06-30 21:44:05 +0000
commitdb73773bde1bd2660a1bf76988b794a6a8a74ab5 (patch)
treebcca24ebfb6912965bcc6aed61d9046af5913b02 /toolchain/Makefile
parentb284b583becd3a4da78dc934b382f8d3ae9e8c06 (diff)
uClibc: split the package into the main directory and the headers/ and utils/ subdirectories to clean up build order and fix quilt support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32557 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/Makefile')
-rw-r--r--toolchain/Makefile22
1 files changed, 18 insertions, 4 deletions
diff --git a/toolchain/Makefile b/toolchain/Makefile
index 0ef0b061f..e16b4d9e9 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