From 0062430ad55647e416312110adf13acacbc45dcc Mon Sep 17 00:00:00 2001 From: Ivan Kuten Date: Mon, 17 Dec 2007 11:37:47 +0000 Subject: revert 20646 rev (gcc-cc_links-fix.diff), it's broken for arm as mentioned in 1764 issue --- toolchain/gcc/gcc-uclibc-3.x.mk | 4 ++-- toolchain/gcc/gcc-uclibc-4.x.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk index 341be6957..e2210d06c 100644 --- 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 9c2846bea..cbf509555 100644 --- 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; \ -- cgit v1.2.3