revert 20646 rev (gcc-cc_links-fix.diff), it's broken for arm as mentioned in 1764...

diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk
index 341be69573d5b6cf2d28ac3bd6ee979877297491..e2210d06c5dc977ad9c7b14f1c23713700e4108e 100644 (file)
--- a/toolchain/gcc/gcc-uclibc-3.x.mk
+++ b/toolchain/gcc/gcc-uclibc-3.x.mk
@@ -293,8 +293,8 @@ endif
                ln -snf $(REAL_GNU_TARGET_NAME)-gcc \
                        $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc; \
        fi
-       if [ ! -e $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin/cc ]; then \
-               ln -snf gcc $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin/cc; \
+       if [ ! -e $(STAGING_DIR)/usr/bin/gcc ]; then \
+               ln -snf gcc $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc; \
        fi
        # Set up the symlinks to enable lying about target name.
        set -e; \

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 9c2846beabc2489a8b021eafd1ce162183d2295a..cbf5095558e5e458c810344c5310fbdc4c70703c 100644 (file)
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -306,8 +306,8 @@ endif
                ln -snf $(REAL_GNU_TARGET_NAME)-gcc \
                        $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc; \
        fi
-       if [ ! -e $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin/cc ]; then \
-               ln -snf gcc $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin/cc; \
+       if [ ! -e $(STAGING_DIR)/usr/bin/cc ]; then \
+               ln -snf gcc $(STAGING_DIR)/usr/bin/cc; \
        fi
        # Set up the symlinks to enable lying about target name.
        set -e; \