Revert "gcc-cross: aviod creating invalid symlinks"

This reverts commit 7893e74311e53882d8f93ecb95a6bd9f5b14651e since it breaks
the builds.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 3 insertions, 6 deletions

diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
index 87d11ab476..ea105e6eb0 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
@@ -51,8 +51,7 @@ do_install () {
         dest=${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/
         install -d $dest
         for t in ar as ld nm objcopy objdump ranlib strip g77 gcc cpp gfortran; do
-                [ ! -e ${BINRELPATH}/${TARGET_PREFIX}$t ] || \
-                ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t
+                ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t
         done
 }
 
diff --git a/meta/recipes-devtools/gcc/gcc-package-cross.inc b/meta/recipes-devtools/gcc/gcc-package-cross.inc
index 3d52d23f92..e32412c127 100644
--- a/meta/recipes-devtools/gcc/gcc-package-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-cross.inc
@@ -19,10 +19,8 @@ do_install () {
         dest=${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/
         install -d $dest
         for t in ar as ld nm objcopy objdump ranlib strip g77 gcc cpp gfortran; do
-        if [ -e ${BINRELPATH}/${TARGET_PREFIX}$t ]; then
-                    ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t
-                    ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t ${dest}${TARGET_PREFIX}$t
-        fi
+                ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t
+                ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t ${dest}${TARGET_PREFIX}$t
         done
 
         # Remove things we don't need but keep share/java