From 0c9366028d24ae93d1b91bce5e812c621562f8e2 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Sat, 7 Apr 2012 17:35:33 +0200 Subject: ptxd_install_toolchain_lib: just follow links if the prefix cannot be detected Signed-off-by: Michael Olbrich --- scripts/install_copy_toolchain.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/scripts/install_copy_toolchain.sh b/scripts/install_copy_toolchain.sh index 3d5c7aac6..5b68f3eb4 100755 --- a/scripts/install_copy_toolchain.sh +++ b/scripts/install_copy_toolchain.sh @@ -141,10 +141,6 @@ ptxd_install_toolchain_lib() { # guess sysroot from given lib eval $(ptxd_split_lib_prefix_sysroot_eval "${lib_path}") - if test -z "${prefix}" -a -z "${dest}"; then - ptxd_bailout "cannot identify prefix and no user supplied dest" - fi - # if the user has given us a $dest use it prefix="${dest:-${prefix}}" @@ -170,10 +166,12 @@ ptxd_install_toolchain_lib() { eval $(ptxd_split_lib_prefix_sysroot_eval "${lnk_path}" lnk) lnk_prefix="${dest:-${lnk_prefix}}" - lnk_prefix="$(ptxd_abs2rel "${prefix}" "${lnk_prefix}")" - lnk_prefix="${lnk_prefix}${lnk_prefix:+/}" - # now remember that link for later - echo "ptxd_install_link \"${lnk_prefix}${lnk}\" \"${prefix}/${lib}\"" >> "${STATEDIR}/${packet}.cmds" + if test -n "${prefix}"; then + lnk_prefix="$(ptxd_abs2rel "${prefix}" "${lnk_prefix}")" + lnk_prefix="${lnk_prefix}${lnk_prefix:+/}" + # now remember that link for later + echo "ptxd_install_link \"${lnk_prefix}${lnk}\" \"${prefix}/${lib}\"" >> "${STATEDIR}/${packet}.cmds" + fi lib_path="${lnk_path}" continue @@ -208,6 +206,10 @@ ptxd_install_toolchain_lib() { # ordinary shared lib, just copy it echo "lib - ${lib_path}" + if test -z "${prefix}"; then + ptxd_bailout "cannot identify prefix and no user supplied dest" + fi + perm="$(stat -c %a "${lib_path}")" echo "ptxd_install_file \"${lib_path}\" \"${prefix}/${lib}\" 0 0 \"${perm}\" \"${strip}\"" >> "${STATEDIR}/${packet}.cmds" -- cgit v1.2.3