summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Maw <jonathan.maw@codethink.co.uk>2017-09-05 14:14:04 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2017-10-25 13:41:36 (GMT)
commit4426563e2600f11891fba1efce6ff16b49986403 (patch)
tree9302abb124a6e494eedbfe4a849cdfdaef625a77
parent3d4417630d4065fb764d10c9a6d9ab69963c27bd (diff)
downloaddefinitions-4426563e2600f11891fba1efce6ff16b49986403.tar.gz
gnu-toolchain: Fix libgcc_s.so being installed with a bad symlink
This is currently because fhs-dirs makes /lib a symlink to /usr/lib, and buildstream mangles symlink paths from absolute paths to relative paths. The symlink ../tools/lib/libgcc_s.so ends up in /usr/lib, breaking things. This fixes that by explicitly installing the symlink to /usr/lib
-rw-r--r--elements/gnu-toolchain/stage2-gcc.bst6
1 files changed, 3 insertions, 3 deletions
diff --git a/elements/gnu-toolchain/stage2-gcc.bst b/elements/gnu-toolchain/stage2-gcc.bst
index dffa443..13b925a 100644
--- a/elements/gnu-toolchain/stage2-gcc.bst
+++ b/elements/gnu-toolchain/stage2-gcc.bst
@@ -97,9 +97,9 @@ config:
libdir=lib
fi
- install -d "%{install-root}/lib"
- ln -s "%{prefix}/$libdir/libgcc_s.so" "%{install-root}/lib/"
- ln -s "%{prefix}/$libdir/libgcc_s.so.1" "%{install-root}/lib/"
+ install -d "%{install-root}/usr/lib"
+ ln -s "%{prefix}/$libdir/libgcc_s.so" "%{install-root}/usr/lib/"
+ ln -s "%{prefix}/$libdir/libgcc_s.so.1" "%{install-root}/usr/lib/"
strip-commands:
- |