diff options
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | scripts/crosstool-NG.sh.in | 2 | ||||
| -rw-r--r-- | scripts/wrapper.in | 5 |
3 files changed, 6 insertions, 5 deletions
@@ -327,12 +327,12 @@ has_or_abort prog=make \ ver='^GNU Make (3.[89][[:digit:]]|[4-9])' \ err="GNU 'make' 3.80 or above was not found" has_or_abort prog=gcc -has_or_abort prog=awk +has_or_abort prog="awk gawk" ver='^GNU Awk' err="GNU 'awk' was not found" has_or_abort prog=bison has_or_abort prog=flex has_or_abort prog=makeinfo has_or_abort prog=automake \ - ver='\(GNU automake\) (1\.[[:digit:]]{2,}\.|[2-9][[:digit:]]*\.)' \ + ver='\(GNU automake\) (1\.[[:digit:]]{2,}|[2-9][[:digit:]]*\.)' \ err="'automake' 1.10 or above was not found" has_or_abort prog=libtool \ ver='\(GNU libtool.*\) (2[[:digit:]]*\.|1\.6[[:digit:]]*\.|1\.5\.[2-9][[:digit:]]+)' \ diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in index 36c77bac..6382c0a6 100644 --- a/scripts/crosstool-NG.sh.in +++ b/scripts/crosstool-NG.sh.in @@ -405,7 +405,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 6222333d..1c501ebf 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" |