From 7be22464cba07f89d3b13e8cdc076842d8fc14b1 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Fri, 7 Apr 2017 13:01:08 +0200 Subject: install_copy_toolchain: /usr merge Signed-off-by: Michael Olbrich --- scripts/install_copy_toolchain.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/install_copy_toolchain.sh b/scripts/install_copy_toolchain.sh index 150acc80f..f38e8959c 100755 --- a/scripts/install_copy_toolchain.sh +++ b/scripts/install_copy_toolchain.sh @@ -50,7 +50,7 @@ ptxd_get_dl() { # out: eval sysroot= prefix= # ptxd_split_lib_prefix_sysroot_eval() { - local lib_path lib lib_dir prefix tmp pre + local lib_path lib lib_dir prefix tmp pre sysroot lib_path="${1}" pre="${2:+${2}_}" @@ -65,8 +65,13 @@ ptxd_split_lib_prefix_sysroot_eval() { break fi done + sysroot="${lib_dir%${prefix}}" + tmp="${prefix#/usr}" + if [ "${tmp}" == "${prefix}" ]; then + prefix="/usr${prefix}" + fi - echo "${pre}sysroot=\"${lib_dir%${prefix}}\" ${pre}prefix=\"${prefix}\"" + echo "${pre}sysroot=\"${sysroot}\" ${pre}prefix=\"${prefix}\"" } -- cgit v1.2.3