summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-01-31 10:10:06 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-01-31 10:10:06 +0000
commit47857d95ce034d397d74c94ede556f4c5dba9f62 (patch)
tree76900070f5b3e649f03207f638f1f572b28400aa
parent2c272874b82d0a0e4b1412303fcedff638ec9283 (diff)
- remove the '"install uClibc headers in the target filesystem" without a native compiler' option.
-rw-r--r--package/Config.in1
-rw-r--r--toolchain/Makefile.in2
-rw-r--r--toolchain/gcc/Config.in.21
-rw-r--r--toolchain/uClibc/Config.in.26
-rw-r--r--toolchain/uClibc/Makefile.in4
-rw-r--r--toolchain/uClibc/uclibc.mk26
6 files changed, 0 insertions, 40 deletions
diff --git a/package/Config.in b/package/Config.in
index 06f45fe5e..ca2221f5b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -32,7 +32,6 @@ source "package/tar/Config.in"
endif
comment "Other development stuff"
-source "toolchain/uClibc/Config.in.2"
source "package/autoconf/Config.in"
source "package/automake/Config.in"
source "package/bison/Config.in"
diff --git a/toolchain/Makefile.in b/toolchain/Makefile.in
index 45ee14a3b..1a2c0f26f 100644
--- a/toolchain/Makefile.in
+++ b/toolchain/Makefile.in
@@ -16,5 +16,3 @@ OPTIMIZE_FOR_CPU=$(ARCH)
# gcc has a bunch of needed stuff....
include toolchain/gcc/Makefile.in
-
-include toolchain/uClibc/Makefile.in
diff --git a/toolchain/gcc/Config.in.2 b/toolchain/gcc/Config.in.2
index d83502ba1..bb97286c1 100644
--- a/toolchain/gcc/Config.in.2
+++ b/toolchain/gcc/Config.in.2
@@ -1,7 +1,6 @@
config BR2_PACKAGE_GCC_TARGET
bool "native toolchain in the target filesystem"
default n
- select BR2_PACKAGE_UCLIBC_TARGET_HEADERS
help
If you want the target system to be able to run
binutils/gcc and compile native code, say Y here.
diff --git a/toolchain/uClibc/Config.in.2 b/toolchain/uClibc/Config.in.2
deleted file mode 100644
index 90a065e6e..000000000
--- a/toolchain/uClibc/Config.in.2
+++ /dev/null
@@ -1,6 +0,0 @@
-config BR2_PACKAGE_UCLIBC_TARGET_HEADERS
- bool "install uClibc headers in the target filesystem"
- default n
- help
- Install the uClibc headers and kernel-headers in the
- target filesystem.
diff --git a/toolchain/uClibc/Makefile.in b/toolchain/uClibc/Makefile.in
deleted file mode 100644
index f83651ef0..000000000
--- a/toolchain/uClibc/Makefile.in
+++ /dev/null
@@ -1,4 +0,0 @@
-
-ifeq ($(strip $(BR2_PACKAGE_UCLIBC_TARGET_HEADERS)),y)
-TARGETS+=uclibc_target_headers
-endif
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index b6dea1920..0fcd64c2d 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -323,32 +323,6 @@ $(TARGET_DIR)/usr/lib/libc.a: $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib/libc.a
fi;
touch -c $(TARGET_DIR)/usr/lib/libc.a
-$(TARGET_DIR)/usr/include/libc-internal.h: $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib/libc.a
- $(MAKE1) -C $(UCLIBC_DIR) \
- PREFIX=$(TARGET_DIR) \
- DEVEL_PREFIX=/usr/ \
- RUNTIME_PREFIX=/ \
- install_headers
- # Install the kernel headers to the target dir if necessary
- if [ ! -f $(TARGET_DIR)/usr/include/linux/version.h ] ; then \
- cp -pLR $(LINUX_HEADERS_DIR)/include/asm $(TARGET_DIR)/usr/include/ ; \
- cp -pLR $(LINUX_HEADERS_DIR)/include/linux $(TARGET_DIR)/usr/include/ ; \
- if [ -d $(LINUX_HEADERS_DIR)/include/asm-generic ] ; then \
- cp -pLR $(LINUX_HEADERS_DIR)/include/asm-generic \
- $(TARGET_DIR)/usr/include/ ; \
- fi; \
- fi;
-
-ifeq ($(BR2_PACKAGE_UCLIBC_TARGET_HEADERS),y)
-uclibc_target_headers: $(TARGET_DIR)/usr/include/libc-internal.h
-uclibc_target_headers-clean:
- rm -rf $(TARGET_DIR)/usr/include
-uclibc_target_headers-dirclean:
- rm -rf $(TARGET_DIR)/usr/include
-else
-uclibc_target_headers: ;
-endif
-
uclibc_target: gcc uclibc $(TARGET_DIR)/usr/lib/libc.a $(TARGET_DIR)/usr/bin/ldd
uclibc_target-clean: