diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-04-07 13:01:08 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-04-11 11:22:13 +0200 |
| commit | 7be22464cba07f89d3b13e8cdc076842d8fc14b1 (patch) | |
| tree | 538948a7e3d3e9588cd5aaa1c6cf5941b1c7e9a3 /scripts | |
| parent | bddae72787560dfc1e774fc6d3268e8b318fb3bb (diff) | |
| download | ptxdist-7be22464cba07f89d3b13e8cdc076842d8fc14b1.tar.gz ptxdist-7be22464cba07f89d3b13e8cdc076842d8fc14b1.tar.xz | |
install_copy_toolchain: /usr merge
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/install_copy_toolchain.sh | 9 |
1 files changed, 7 insertions, 2 deletions
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}\"" } |