From: Peter Rosin <peda@lysator.liu.se>
Date: Mon, 15 Nov 2010 09:27:55 +0000 (+0100)
Subject: compile: clear the `eat' variable earlier.
X-Git-Tag: ng-0.5a~101^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89bf665808e6ed7a68957342e6343cf3261ebf14;p=thirdparty%2Fautomake.git

compile: clear the `eat' variable earlier.

* lib/compile: Clear the `eat' variable earlier.
* tests/compile3.test: Prevent regressions.

Signed-off-by: Peter Rosin <peda@lysator.liu.se>
---

diff --git a/ChangeLog b/ChangeLog
index ad402d058..5e326d1ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-15  Peter Rosin  <peda@lysator.liu.se>
+
+	compile: clear the `eat' variable earlier.
+	* lib/compile: Clear the `eat' variable earlier.
+	* tests/compile3.test: Prevent regressions.
+
 2010-10-07  Peter Rosin  <peda@lysator.liu.se>
 
 	depcomp: add new one-pass depmode for MSVC 7 and later.
diff --git a/lib/compile b/lib/compile
index 46caccc37..1c6f105ec 100755
--- a/lib/compile
+++ b/lib/compile
@@ -192,6 +192,8 @@ func_cl_wrapper ()
   exit 1
 }
 
+eat=
+
 case $1 in
   '')
      echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
@@ -223,7 +225,6 @@ esac
 
 ofile=
 cfile=
-eat=
 
 for arg
 do
diff --git a/tests/compile3.test b/tests/compile3.test
index e376800c5..5a5be7e55 100755
--- a/tests/compile3.test
+++ b/tests/compile3.test
@@ -46,4 +46,8 @@ test x"$opts" = x"-c foo.c -Fofoo.o -Ibaz"
 opts=`./compile ./cl -c foo.cc -o foo.o -Ibaz`
 test x"$opts" = x"-c -Tpfoo.cc -Fofoo.o -Ibaz"
 
+# Check if compile clears the "eat" variable properly.
+opts=`eat=1 ./compile ./cl -c foo.c -o foo.obj -Ibaz`
+test x"$opts" = x"-c foo.c -Fofoo.obj -Ibaz"
+
 :