config/path: avoid LD_LIBRARY_PATH trailing colon which breaks glibc build

This commit is contained in:
MilhouseVH 2017-05-10 22:29:02 +01:00
parent 372138e917
commit 77a9346d4c

View File

@ -194,12 +194,12 @@ fi
export MAKEFLAGS=-j$CONCURRENCY_MAKE_LEVEL
export PKG_CONFIG=$TOOLCHAIN/bin/pkg-config
if [ -z "$PATH" -o "$PATH" = "${PATH#$TOOLCHAIN/bin:}" ]; then
export PATH="$TOOLCHAIN/bin:$TOOLCHAIN/sbin:$PATH"
if [[ -z "$PATH" || ( "$PATH" != "$TOOLCHAIN/bin:$TOOLCHAIN/sbin" && "$PATH" = "${PATH#$TOOLCHAIN/bin:$TOOLCHAIN/sbin:}" ) ]]; then
export PATH="$TOOLCHAIN/bin:$TOOLCHAIN/sbin${PATH:+":$PATH"}"
fi
if [ -z "$LD_LIBRARY_PATH" -o "$LD_LIBRARY_PATH" = "${LD_LIBRARY_PATH#$TOOLCHAIN/lib:}" ]; then
export LD_LIBRARY_PATH="$TOOLCHAIN/lib:$LD_LIBRARY_PATH"
if [[ -z "$LD_LIBRARY_PATH" || ( "$LD_LIBRARY_PATH" != "$TOOLCHAIN/lib" && "$LD_LIBRARY_PATH" = "${LD_LIBRARY_PATH#$TOOLCHAIN/lib:}" ) ]]; then
export LD_LIBRARY_PATH="$TOOLCHAIN/lib${LD_LIBRARY_PATH:+":$LD_LIBRARY_PATH"}"
fi
VERSION_SUFFIX=$TARGET_ARCH