From: Rob Landley <rob@landley.net>
Date: Thu, 11 Sep 2014 05:04:37 +0000 (-0500)
Subject: Oops, unbreak make.sh.
X-Git-Tag: android-x86-6.0-r1~354
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=09af6a7d3f5076b52a89a4be5cebebdb9c9d00c8;p=android-x86%2Fexternal-toybox.git

Oops, unbreak make.sh.

Clearing out old .o files needs -r now that generated/obj has its own subdirectory. (Works if you make clean between, but shouldn't need it.)
---

diff --git a/scripts/make.sh b/scripts/make.sh
index d51409af..34c1db51 100755
--- a/scripts/make.sh
+++ b/scripts/make.sh
@@ -172,7 +172,7 @@ LINK="$LDOPTIMIZE -o toybox_unstripped -Wl,--as-needed $(cat generated/optlibs.d
 
 # This is a parallel version of: do_loudly $BUILD $FILES $LINK || exit 1
 
-rm -f generated/obj && mkdir -p generated/obj || exit 1
+rm -rf generated/obj && mkdir -p generated/obj || exit 1
 PENDING=
 for i in $FILES
 do