From a5b6b0d129bc6672203a0dfb844a24495a207235 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Fri, 15 Nov 2013 18:58:42 +0100 Subject: scripts: remove duplicate '/' in prefix, it breaks relocation Reported-by: Richard Weinberger Signed-off-by: "Yann E. MORIN" diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in index b6bfeb4..7126ee7 100644 --- a/scripts/crosstool-NG.sh.in +++ b/scripts/crosstool-NG.sh.in @@ -154,6 +154,9 @@ CT_DoBuildTargetTuple # Sanity check some directories CT_TestAndAbort "'CT_PREFIX_DIR' is not set: where should I install?" -z "${CT_PREFIX_DIR}" +# Avoid multiple '/' in the prefix dir, it breaks relocatability +CT_PREFIX_DIR="$( "${sed}" -r -e 's:/+:/:g; s:/*$::;' <<<"${CT_PREFIX_DIR}" )" + # Second kludge: merge user-supplied target CFLAGS with architecture-provided # target CFLAGS. Do the same for LDFLAGS in case it happens in the future. # Put user-supplied flags at the end, so that they take precedence. -- cgit v0.10.2-6-g49f6