Merge the canadian branch to default.

Now the preliminray support for canadian-crosses is done,
merge to default. The few remaining quirks, if any, will
be resolved on mainstream.

2 files changed, 9 insertions, 3 deletions

diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh
index 15dc5a5..e1f5d25 100644
--- a/scripts/build/cc/gcc.sh
+++ b/scripts/build/cc/gcc.sh
@@ -41,6 +41,10 @@ do_cc_extract() {
 #------------------------------------------------------------------------------
 # Core gcc pass 1
 do_cc_core_pass_1() {
+    # If we're building a canadian compiler no use to build the CC
+    # core compiler, we're not using it
+    [ -n "${CT_CANADIAN}" ] && return 0
+
     # If we're building for bare metal, build the static core gcc,
     # with libgcc.
     # In case we're not bare metal, and we're NPTL, build the static core gcc.
@@ -54,6 +58,10 @@ do_cc_core_pass_1() {
 
 # Core gcc pass 2
 do_cc_core_pass_2() {
+    # If we're building a canadian compiler no use to build the CC
+    # core compiler, we're not using it
+    [ -n "${CT_CANADIAN}" ] && return 0
+
     # In case we're building for bare metal, do nothing, we already have
     # our compiler.
     # In case we're NPTL, build the shared core gcc and the target libgcc.
diff --git a/scripts/build/internals.sh b/scripts/build/internals.sh
index 8a887bf..a920c50 100644
--- a/scripts/build/internals.sh
+++ b/scripts/build/internals.sh
@@ -9,9 +9,7 @@ do_finish() {
     CT_DoStep INFO "Cleaning-up the toolchain's directory"
 
     CT_DoLog EXTRA "Removing access to the build system tools"
-    find "${CT_PREFIX_DIR}/bin" -name "${CT_BUILD}-"'*' -exec rm -fv {} \; |CT_DoLog DEBUG
-    find "${CT_PREFIX_DIR}/bin" -name "${CT_HOST}-"'*' -exec rm -fv {} \; |CT_DoLog DEBUG
-    CT_DoExecLog DEBUG rm -fv "${CT_PREFIX_DIR}/bin/makeinfo"
+    CT_DoExecLog DEBUG rm -rf "${CT_PREFIX_DIR}/buildtools"
 
     if [ "${CT_BARE_METAL}" != "y" ]; then
         CT_DoLog EXTRA "Installing the populate helper"