From 3136ecb066a9f51bcdc795b0b940851c851f5d27 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sun, 6 Sep 2009 17:58:05 +0200
Subject: tools wrapper: fix building

Remove the build tools only after the wrapper is built.
Use the corect C compiler to build the tools wrapper.
Use the correct log level.

diff --git a/scripts/build/internals.sh b/scripts/build/internals.sh
index 093636a..144cb87 100644
--- a/scripts/build/internals.sh
+++ b/scripts/build/internals.sh
@@ -8,9 +8,6 @@ do_finish() {
 
     CT_DoStep INFO "Cleaning-up the toolchain's directory"
 
-    CT_DoLog EXTRA "Removing access to the build system tools"
-    CT_DoExecLog DEBUG rm -rf "${CT_PREFIX_DIR}/buildtools"
-
     if [ "${CT_BARE_METAL}" != "y" ]; then
         CT_DoLog EXTRA "Installing the populate helper"
         sed -r -e 's|@@CT_TARGET@@|'"${CT_TARGET}"'|g;' \
@@ -58,11 +55,11 @@ do_finish() {
                 if [ "${CT_DEBUG_CT}" = "y" ]; then
                   _t="" # If debugging crosstool-NG, don't strip the wrapper
                 fi
-                CT_DoExecLog "${HOST_CC}"                               \
-                             -Wall -Wextra -Wunreachable-code -Werror   \
-                             -O3 -static ${_t}                          \
-                             "${CT_LIB_DIR}/scripts/wrapper.c"          \
-                             -o ".${CT_TARGET}-wrapper"
+                CT_DoExecLog DEBUG "${CT_HOST}-gcc"                           \
+                                   -Wall -Wextra -Wunreachable-code -Werror   \
+                                   -O3 -static ${_t}                          \
+                                   "${CT_LIB_DIR}/scripts/wrapper.c"          \
+                                   -o ".${CT_TARGET}-wrapper"
                 ;;
         esac
 
@@ -82,6 +79,9 @@ do_finish() {
         CT_Popd
     fi
 
+    CT_DoLog EXTRA "Removing access to the build system tools"
+    CT_DoExecLog DEBUG rm -rf "${CT_PREFIX_DIR}/buildtools"
+
     # Remove the generated documentation files
     if [ "${CT_REMOVE_DOCS}" = "y" ]; then
         CT_DoLog EXTRA "Removing installed documentation"
-- 
cgit v0.10.2-6-g49f6