diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-08-03 06:50:56 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-08-03 06:50:56 (GMT) |
| commit | 946a86fb675935229f264dfcad53fef66ee98442 (patch) | |
| tree | b2afdd8b2d0e6b571a1eb64a3f0944d61f24039e /scripts | |
| parent | 70f87b89699f1ed99d14a174d0a32f3aa1ecb653 (diff) | |
| parent | 33ed1557b64e4449fbb368993f048a8f32678f0f (diff) | |
[config] Merge CONFIG_SHELL selection.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/addToolVersion.sh | 6 | ||||
| -rw-r--r-- | scripts/crosstool-NG.sh.in | 2 | ||||
| -rw-r--r-- | scripts/wrapper.in | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh index 337c656..255b8fe 100755 --- a/scripts/addToolVersion.sh +++ b/scripts/addToolVersion.sh @@ -96,7 +96,11 @@ addToolVersion() { ver_m=$(echo "${version}...." |cut -d . -f 2) if [ ${ver_M} -gt 4 \ -o \( ${ver_M} -eq 4 -a ${ver_m} -ge 3 \) ]; then - SedExpr1=" select CC_GCC_4_3_or_later\n" + SedExpr1="${SedExpr1} select CC_GCC_4_3_or_later\n" + fi + if [ ${ver_M} -gt 4 \ + -o \( ${ver_M} -eq 4 -a ${ver_m} -ge 4 \) ]; then + SedExpr1="${SedExpr1} select CC_GCC_4_4_or_later\n" fi fi SedExpr2=" default \"${version}\" if ${cat}_V_${v}" diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in index ad03d2d..ba30c4f 100644 --- a/scripts/crosstool-NG.sh.in +++ b/scripts/crosstool-NG.sh.in @@ -412,7 +412,7 @@ if [ -z "${CT_RESTART}" ]; then else case "${tool}" in # We'll at least need some of them... - ar|as|gcc|ld|nm|objcopy|objdump|ranlib) + ar|as|gcc|g++|ld|nm|objcopy|objdump|ranlib) CT_Abort "Missing: '${t}${tool}${!s}' or '${t}${tool}' or '${tool}' : either needed!" ;; # Some are conditionnally required diff --git a/scripts/wrapper.in b/scripts/wrapper.in index 6222333..1c501eb 100644 --- a/scripts/wrapper.in +++ b/scripts/wrapper.in @@ -1,7 +1,8 @@ #!/bin/sh -dirname="$(dirname "${0}")" -basename="$(basename "${0}")" +canonicalizedname=$(readlink -nm "${0}") +dirname="$(dirname "${canonicalizedname}")" +basename="$(basename "${canonicalizedname}")" ld_lib_path="$(dirname "${dirname}")/lib" |