summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-14 15:23:26 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-14 15:23:26 +0000
commit774b7a34de280aab696815a85cc81494a4ddb1ea (patch)
tree8b538a2b37bd32988e59e0cd9a41228d327f4041
parent96b7e1780c3a25bc19022b66a9d92a9ccf22dc59 (diff)
downloadopenembedded-core-774b7a34de280aab696815a85cc81494a4ddb1ea.tar.gz
openembedded-core-774b7a34de280aab696815a85cc81494a4ddb1ea.tar.bz2
openembedded-core-774b7a34de280aab696815a85cc81494a4ddb1ea.zip
Revert "gcc-cross: aviod creating invalid symlinks"
This reverts commit 7893e74311e53882d8f93ecb95a6bd9f5b14651e since it breaks the builds.
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-intermediate.inc3
-rw-r--r--meta/recipes-devtools/gcc/gcc-package-cross.inc6
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