diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-06-30 21:44:05 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-06-30 21:44:05 +0000 |
| commit | 87cb557dcb99ce3a587ef93122415244c007032d (patch) | |
| tree | bcca24ebfb6912965bcc6aed61d9046af5913b02 /toolchain/Makefile | |
| parent | a8311020d66c4da2c9052c5c9cd8df178cae3671 (diff) | |
| download | upstream-87cb557dcb99ce3a587ef93122415244c007032d.tar.gz upstream-87cb557dcb99ce3a587ef93122415244c007032d.tar.bz2 upstream-87cb557dcb99ce3a587ef93122415244c007032d.zip | |
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/Makefile | 22 |
1 files changed, 18 insertions, 4 deletions
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 |