diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-07-03 14:23:32 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-07-03 14:23:32 +0000 |
| commit | d4f13972f8563c005b18297d4dd9a40ab7e8dc31 (patch) | |
| tree | d759d2ce56ecb0902ac0edc363a01ef3263aaf3a /toolchain/Makefile | |
| parent | 4b157f4b59c22aa358188d20fc925f57843d7075 (diff) | |
toolchain: sync eglibc headers/build split with uclibc changes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32584 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/Makefile')
| -rw-r--r-- | toolchain/Makefile | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/toolchain/Makefile b/toolchain/Makefile index 25f8f4645d..bdfb29ec17 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -28,9 +28,8 @@ 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)) ifdef CONFIG_USE_UCLIBC - $(curdir)/builddirs += $(LIBC)/headers $(curdir)/builddirs += $(LIBC)/utils endif $(curdir)/builddirs-compile:=$($(curdir)/builddirs-prepare) @@ -43,21 +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 + $(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 ifdef CONFIG_GCC_VERSION_LLVM |