# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1210885206 0
# Node ID 3a50cce6d3ced7b592e1e39c856c50c553236c56
# Parent  be875e19bc28976d965740c5e22e49ac480b6889
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(-)

diff -r be875e19bc28 -r 3a50cce6d3ce scripts/build/cc_gcc.sh
--- a/scripts/build/cc_gcc.sh	Thu May 15 20:56:53 2008 +0000
+++ b/scripts/build/cc_gcc.sh	Thu May 15 21:00:06 2008 +0000
@@ -65,6 +65,7 @@
     CT_DoLog DEBUG "Extra config passed: \"${extra_config}\""
 
     # Use --with-local-prefix so older gccs don't look in /usr/local (http://gcc.gnu.org/PR10532)
+    CC_FOR_BUILD="${CT_CC_NATIVE}"                  \
     CFLAGS="${CT_CFLAGS_FOR_HOST}"                  \
     "${CT_SRC_DIR}/${CT_CC_FILE}/configure"         \
         ${CT_CANADIAN_OPT}                          \
@@ -81,6 +82,7 @@
         --enable-symvers=gnu                        \
         --enable-languages=c                        \
         --disable-shared                            \
+        --enable-target-optspace                    \
         ${CT_CC_CORE_EXTRA_CONFIG}                  2>&1 |CT_DoLog ALL
 
     if [ "${CT_CANADIAN}" = "y" ]; then
@@ -117,6 +119,7 @@
 
     CT_DoLog DEBUG "Extra config passed: \"${extra_config}\""
 
+    CC_FOR_BUILD="${CT_CC_NATIVE}"                  \
     CFLAGS="${CT_CFLAGS_FOR_HOST}"                  \
     "${CT_SRC_DIR}/${CT_CC_FILE}/configure"         \
         ${CT_CANADIAN_OPT}                          \
@@ -131,6 +134,7 @@
         --enable-symvers=gnu                        \
         --enable-languages=c                        \
         --enable-shared                             \
+        --enable-target-optspace                    \
         ${CT_CC_CORE_EXTRA_CONFIG}                  2>&1 |CT_DoLog ALL
 
     # HACK: we need to override SHLIB_LC from gcc/config/t-slibgcc-elf-ver or
@@ -225,6 +229,7 @@
     # detection problem only matters for gcc-3.2.x and later, I think.
     # --disable-nls to work around crash bug on ppc405, but also because
     # embedded systems don't really need message catalogs...
+    CC_FOR_BUILD="${CT_CC_NATIVE}"              \
     CFLAGS="${CT_CFLAGS_FOR_HOST}"              \
     TARGET_CFLAGS="${CT_TARGET_CFLAGS}"         \
     "${CT_SRC_DIR}/${CT_CC_FILE}/configure"     \
@@ -239,6 +244,7 @@
         --enable-symvers=gnu                    \
         --enable-c99                            \
         --enable-long-long                      \
+        --enable-target-optspace                \
         ${CT_CC_EXTRA_CONFIG}                   2>&1 |CT_DoLog ALL
 
     if [ "${CT_CANADIAN}" = "y" ]; then
diff -r be875e19bc28 -r 3a50cce6d3ce scripts/crosstool.sh
--- a/scripts/crosstool.sh	Thu May 15 20:56:53 2008 +0000
+++ b/scripts/crosstool.sh	Thu May 15 21:00:06 2008 +0000
@@ -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 @@
     # 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}"