aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAchille Fouilleul <achille.fouilleul@gadz.org>2018-10-05 16:38:08 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-09 12:02:41 +0100
commit3d6372aa2d9f752eac0e4943d1bde04f0f1924a0 (patch)
tree76bae0ad6858435901a27566f983922cbc55be4a
parentea1204c6d9a02f0e38cf616e89d46530908972bb (diff)
downloadopenembedded-core-contrib-3d6372aa2d9f752eac0e4943d1bde04f0f1924a0.tar.gz
openembedded-core-contrib-3d6372aa2d9f752eac0e4943d1bde04f0f1924a0.tar.bz2
openembedded-core-contrib-3d6372aa2d9f752eac0e4943d1bde04f0f1924a0.zip
binutils: fix symlinks
For nativesdk, symlinks created by do_install contain ${SDKPATHNATIVE}. This is a problem with SDKs that include nativesdk-binutils and nativesdk-gcc. When extracting such an SDK dangling symlinks are created, because relocate_sdk.py does not adjust symlinks. As a result gcc ends up calling the host binutils. Use the os.path.relpath function to obtain shorter relative paths, which do not contain ${SDKPATHNATIVE}. Signed-off-by: Achille Fouilleul <achille.fouilleul@gadz.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/binutils/binutils.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
index 81ecbb50cc1..0fb6cae407b 100644
--- a/meta/recipes-devtools/binutils/binutils.inc
+++ b/meta/recipes-devtools/binutils/binutils.inc
@@ -131,12 +131,12 @@ do_install () {
# We don't really need these, so we'll remove them...
rm -rf ${D}${libdir}/ldscripts
+ bindir_rel=${@os.path.relpath('${bindir}', '${prefix}/${TARGET_SYS}/bin')}
+
# Fix the /usr/${TARGET_SYS}/bin/* links
for l in ${D}${prefix}/${TARGET_SYS}/bin/*; do
rm -f $l
- ln -sf `echo ${prefix}/${TARGET_SYS}/bin \
- | tr -s / \
- | sed -e 's,^/,,' -e 's,[^/]*,..,g'`${bindir}/${TARGET_PREFIX}`basename $l` $l
+ ln -sf $bindir_rel/${TARGET_PREFIX}`basename $l` $l
done
# Install the libiberty header