uClibc-Update.

[ipfire-2.x.git] / src / uClibc / make / uclibc.mk

diff --git a/src/uClibc/make/uclibc.mk b/src/uClibc/make/uclibc.mk
index 0a136ebecdeba9c0b810fd47f85341860b3ea98a..accef5fefd7072b2e717d96127620ef56d05190e 100644 (file)
--- a/src/uClibc/make/uclibc.mk
+++ b/src/uClibc/make/uclibc.mk
@@ -94,8 +94,10 @@ endif
 
 uclibc-configured: $(UCLIBC_DIR)/.configured
 
-uclibc: $(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-gcc $(STAGING_DIR)/lib/libc.a \
-       $(UCLIBC_TARGETS)
+#uclibc: $(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-gcc $(STAGING_DIR)/lib/libc.a \
+#      $(UCLIBC_TARGETS)
+
+uclibc: fix_gcc $(STAGING_DIR)/lib/libc.a $(UCLIBC_TARGETS)
 
 uclibc-source: $(DL_DIR)/$(UCLIBC_SOURCE)
 
@@ -108,9 +110,6 @@ uclibc-clean:
 uclibc-dirclean:
        rm -rf $(UCLIBC_DIR)
 
-
-
-
 #############################################################
 #
 # uClibc for the target just needs its header files
@@ -136,7 +135,7 @@ $(TARGET_DIR)/usr/lib/libc.a: $(STAGING_DIR)/lib/libc.a
 ifeq ($(GCC_2_95_TOOLCHAIN),true)
 uclibc_target: gcc2_95 uclibc $(TARGET_DIR)/usr/lib/libc.a
 else
-uclibc_target: gcc3_3 uclibc $(TARGET_DIR)/usr/lib/libc.a
+uclibc_target: gcc uclibc $(TARGET_DIR)/usr/lib/libc.a
 endif
 
 uclibc_target-clean:
@@ -145,3 +144,8 @@ uclibc_target-clean:
 uclibc_target-dirclean:
        rm -f $(TARGET_DIR)/include
 
+fix_gcc:
+       cd /opt/$(MACHINE)-uClibc/bin && for i in `find . -name "-*" | cut -c 3-`; do \
+               cat < $$i > $(MACHINE)-linux-uclibc$$i; \
+               chmod 755 $(MACHINE)-linux-uclibc$$i; \
+       done