# HG changeset patch
# User Rob Landley <rob@landley.net>
# Date 1275714612 18000
# Node ID 3c6263354ca9d4db836d328bfd30b7c3d3bcf3b2
# Parent  8f72a8d4acc38e86256dc9d8eff612f955b81443
Blank $STAGE_DIR before adjusting $PATH so building the cross-compiler stage doesn't get confused if it dies during the uClibc++ build and gets re-run (adjusting the path to point to the cross compiler we're about to delete and rebuild).  Make NO_CLEANUP explicit in system-image.sh so it can rebuild zImage and squashfs independently by default.

diff -r 8f72a8d4acc3 -r 3c6263354ca9 sources/functions.sh
--- a/sources/functions.sh	Sat Jun 05 00:08:28 2010 -0500
+++ b/sources/functions.sh	Sat Jun 05 00:10:12 2010 -0500
@@ -54,6 +54,9 @@
 
   STAGE_DIR="$BUILD/${STAGE_NAME}-${ARCH_NAME}"
 
+  blank_tempdir "$STAGE_DIR"
+  blank_tempdir "$WORK"
+
   export PATH="$(cc_path "$ARCH")$PATH"
   [ ! -z "$HOST_ARCH" ] && [ "$HOST_ARCH" != "$ARCH" ] &&
     PATH="$(cc_path "$HOST_ARCH")$PATH"
@@ -559,9 +562,6 @@
 
 check_for_base_arch()
 {
-  blank_tempdir "$STAGE_DIR"
-  blank_tempdir "$WORK"
-
   # If we're building something with a base architecture, symlink to actual
   # target.
 
diff -r 8f72a8d4acc3 -r 3c6263354ca9 system-image.sh
--- a/system-image.sh	Sat Jun 05 00:08:28 2010 -0500
+++ b/system-image.sh	Sat Jun 05 00:10:12 2010 -0500
@@ -7,7 +7,7 @@
 
 # Parse the sources/targets/$1 directory
 
-read_arch_dir "$1"
+NO_CLEANUP=1 read_arch_dir "$1"
 
 # Do we have our prerequisites?