summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2011-07-09 22:02:05 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2011-07-09 22:02:05 (GMT)
commit624514508bc54527f5f7928220802bdf44f889e3 (patch)
treef88bb250506527232f0cdc5520b4c1fdb26c5ffe
parent0d319daf2de6ebf027c01b279ee33966fdfc859e (diff)
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> (transplanted from 0e8ff57073838afea8830fe09d1d01cdf7cb37d8)
-rw-r--r--scripts/crosstool-NG.sh.in5
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in
index a3869c1..975024a 100644
--- a/scripts/crosstool-NG.sh.in
+++ b/scripts/crosstool-NG.sh.in
@@ -208,9 +208,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