From 77a9346d4c23dd81d490d0deb69d0c7a9cce63e8 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Wed, 10 May 2017 22:29:02 +0100
Subject: [PATCH] config/path: avoid LD_LIBRARY_PATH trailing colon which
 breaks glibc build

---
 config/path | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/path b/config/path
index fb95604cdb..b3a51ce411 100644
--- a/config/path
+++ b/config/path
@@ -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