diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-03-13 13:33:00 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-03-13 13:33:00 +0000 |
| commit | 17402a5d5d794575d85b62bf0196cacf10d77be8 (patch) | |
| tree | a6326c8dcce31aa4f1c8c970787dd9fe4398940a /bin | |
| parent | e69905a9f62b3095b4d0c3347707d7f49e42a79b (diff) | |
| download | ptxdist-17402a5d5d794575d85b62bf0196cacf10d77be8.tar.gz ptxdist-17402a5d5d794575d85b62bf0196cacf10d77be8.tar.xz | |
* scripts/libptxdist.sh, bin/ptxdist:
make ptxdist roboust, no matter where certain vars are defined
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@7837 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ptxdist | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/bin/ptxdist b/bin/ptxdist index 67e768851..cf4ee9157 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -233,8 +233,9 @@ check_compiler() { # 3) Correct compiler version if a specific compiler version is given # - compiler=$(. ${PLATFORMCONFIG} && echo ${PTXCONF_COMPILER_PREFIX})gcc - vendor_should=$(. ${PLATFORMCONFIG} && echo ${PTXCONF_CROSSCHAIN_VENDOR}) + compiler="$(ptxd_get_ptxconf PTXCONF_COMPILER_PREFIX)gcc" + vendor_should="$(ptxd_get_ptxconf PTXCONF_CROSSCHAIN_VENDOR)" + if [ ! -z "$vendor_should" ]; then # yea! Vendor is specified in the project. So check for # toolchain vendor identification file @@ -258,7 +259,7 @@ check_compiler() { fi fi - compiler_should=$(. "${PLATFORMCONFIG}" && echo ${PTXCONF_CROSSCHAIN_CHECK}) + compiler_should="$(ptxd_get_ptxconf PTXCONF_CROSSCHAIN_CHECK)" compiler_is=$($compiler -dumpversion 2> /dev/null) if [ -z "$compiler_is" ]; then @@ -361,20 +362,20 @@ check_dirs() { # prefix if [ -z "$PREFIX" ]; then - ptxconf_prefix=$(. "${PLATFORMCONFIG}" && echo ${PTXCONF_PREFIX}) + ptxconf_prefix="$(ptxd_get_ptxconf PTXCONF_PREFIX)" else ptxconf_prefix=${PREFIX} fi - ptxconf_prefix_host=$(. "${PLATFORMCONFIG}" && echo ${PTXCONF_HOST_PREFIX}) - ptxconf_prefix_cross=$(. "${PLATFORMCONFIG}" && echo ${PTXCONF_CROSS_PREFIX}) + ptxconf_prefix_host="$(ptxd_get_ptxconf PTXCONF_HOST_PREFIX)" + ptxconf_prefix_cross="$(ptxd_get_ptxconf PTXCONF_CROSS_PREFIX)" for dir in "${ptxconf_prefix_host}" "${ptxconf_prefix_cross}"; do check_dirs_prefix "${dir}" done # sysroot - keep in sync with rules/pre/Rules.make -> SYSROOT - ptxconf_gnu_target=$(. "${PLATFORMCONFIG}" && echo ${PTXCONF_GNU_TARGET}) + ptxconf_gnu_target="$(ptxd_get_ptxconf PTXCONF_GNU_TARGET)" mkdir -p "${ptxconf_prefix}/sysroot/${ptxconf_gnu_target}"/{,usr/}{lib,{,s}bin,include,{,share/}man/man{1,2,3,4,5,6,7,8,9}} # builddirs |