From 5de61c803292614ecb8a8aaa7c0e900341dbae52 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sun, 10 Jul 2011 00:02:05 +0200
Subject: scripts: on startup, also remove the buildtools dir

In case there's one lingering around (whether the previous build was
successful, or failed), we have to remove the buildtools directory
as well as the toochain build dir.

This should also fix the case where out makeinfo wrapper calls
itself recursively.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in
index a0cab79..35acdca 100644
--- a/scripts/crosstool-NG.sh.in
+++ b/scripts/crosstool-NG.sh.in
@@ -213,9 +213,8 @@ CT_TOOLCHAIN_ID="crosstool-${CT_VERSION} build ${CT_STAR_DATE_HUMAN} by ${CT_SYS
 CT_DoLog EXTRA "Preparing working directories"
 
 # Ah! The build directory shall be eradicated, even if we restart!
-if [ -d "${CT_BUILD_DIR}" ]; then
-    CT_DoForceRmdir "${CT_BUILD_DIR}"
-fi
+# Ditto for the build tools install dir
+CT_DoForceRmdir "${CT_BUILD_DIR}" "${CT_BUILDTOOLS_PREFIX_DIR}"
 
 # Don't eradicate directories if we need to restart
 if [ -z "${CT_RESTART}" ]; then
-- 
cgit v0.10.2-6-g49f6