diff options
author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2008-05-15 21:00:06 (GMT) |
---|---|---|
committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2008-05-15 21:00:06 (GMT) |
commit | 10960336912758cb4a293d5bc63f6c902e28ba74 (patch) | |
tree | 1b54e41d7db4d8ebd786a3568f8cc1de03e8f463 /scripts/crosstool.sh | |
parent | 899e3a9302c6b1b0b7dd839d7927dc2b2ea4da22 (diff) |
Backport #633 from trunk:
Sanitise and use CT_CC_NATIVE.
Comment inclusion of scripts/functions.
/branches/1.1/scripts/build/cc_gcc.sh | 6 6 0 0 ++++++
/branches/1.1/scripts/crosstool.sh | 7 6 1 0 ++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
Diffstat (limited to 'scripts/crosstool.sh')
-rwxr-xr-x | scripts/crosstool.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/crosstool.sh b/scripts/crosstool.sh index e85be55..675a330 100755 --- a/scripts/crosstool.sh +++ b/scripts/crosstool.sh @@ -13,6 +13,11 @@ # and builds the tools. # Parse the common functions +# Note: some initialisation and sanitizing is done while parsing this file, +# most notably: +# - set trap handler on errors, +# - don't hash commands lookups, +# - initialise logging. . "${CT_LIB_DIR}/scripts/functions" CT_STAR_DATE=`CT_DoDate +%s%N` @@ -386,7 +391,7 @@ if [ -z "${CT_RESTART}" ]; then # Do that: CT_DoLog DEBUG "Making build system tools available" mkdir -p "${CT_PREFIX_DIR}/bin" - for tool in ar as dlltool gcc g++ gnatbind gnatmake ld nm ranlib strip windres objcopy objdump; do + for tool in ar as dlltool ${CT_CC_NATIVE:=gcc} gnatbind gnatmake ld nm ranlib strip windres objcopy objdump; do tmp=`CT_Which ${tool}` if [ -n "${tmp}" ]; then ln -sfv "${tmp}" "${CT_PREFIX_DIR}/bin/${CT_BUILD}-${tool}" |