summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-23 15:33:40 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-23 15:33:40 (GMT)
commitc52af5da2635e1c168e13f245509ad2986f5604f (patch)
tree8dbb3284e67deb9c9f15427dd4aa52f140b08e90
parentaf943e0b0a20b2a9916ccac19c5ffaef43c484a4 (diff)
parent03aaed6441cd00f95aa7170c96406a3a3113ee17 (diff)
downloaddefinitions-c52af5da2635e1c168e13f245509ad2986f5604f.tar.gz
Merge branch 'baserock/pedroalvarez/ld-check'
Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk> Reviewed-By: Richard Dale <richard.dale@codethink.co.uk>
-rw-r--r--strata/build-essential/stage2-glibc.morph2
1 files changed, 2 insertions, 0 deletions
diff --git a/strata/build-essential/stage2-glibc.morph b/strata/build-essential/stage2-glibc.morph
index 48ceb76..7346cd3 100644
--- a/strata/build-essential/stage2-glibc.morph
+++ b/strata/build-essential/stage2-glibc.morph
@@ -62,5 +62,7 @@ install-commands:
"$DESTDIR/lib64/ld64.so.1" ;;
*)
loader=$(basename $(ls "$DESTDIR$PREFIX"/lib/ld-linux*))
+ [ -z $loader ] && loader=$(basename $(ls "$DESTDIR$PREFIX"/lib/ld.so*))
+ [ -z $loader ] && ( echo "Bug in stage2-glibc ld.so symlinks" ; exit 1 )
ln -s "$PREFIX/lib/$loader" "$DESTDIR/lib/$loader"
esac