summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--strata/build-essential/stage2-glibc.morph15
1 files changed, 9 insertions, 6 deletions
diff --git a/strata/build-essential/stage2-glibc.morph b/strata/build-essential/stage2-glibc.morph
index ffa0970b..3c762a13 100644
--- a/strata/build-essential/stage2-glibc.morph
+++ b/strata/build-essential/stage2-glibc.morph
@@ -39,19 +39,22 @@ install-commands:
# FIXME: get a better way of finding the name of the loader. The lib64
# path is hardcoded into glibc in the file
# sysdeps/unix/sysv/linux/configure.
-- install -d $DESTDIR/lib
+
+- |
+ install -d "$DESTDIR"/usr/lib
+ install -d "$DESTDIR"/usr/lib64
+ ln -s /usr/lib "$DESTDIR"/lib
+ ln -s /usr/lib64 "$DESTDIR"/lib64
- |
cpu=$(echo $TARGET | cut -d '-' -f 1)
case "$cpu" in
x86_64)
- install -d "$DESTDIR/lib64"
ln -s "$PREFIX/lib/ld-linux-x86-64.so.2" \
- "$DESTDIR/lib64/ld-linux-x86-64.so.2" ;;
+ "$DESTDIR/usr/lib64/ld-linux-x86-64.so.2" ;;
ppc64)
- install -d "$DESTDIR/lib64"
ln -s "$PREFIX/lib/ld64.so.1" \
- "$DESTDIR/lib64/ld64.so.1" ;;
+ "$DESTDIR/usr/lib64/ld64.so.1" ;;
*)
loader=$(basename $(ls "$DESTDIR$PREFIX"/lib/ld-linux*))
- ln -s "$PREFIX/lib/$loader" "$DESTDIR/lib/$loader"
+ ln -s "$PREFIX/lib/$loader" "$DESTDIR/usr/lib/$loader"
esac