[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] compile: clear the `eat' variable earlier.
From: |
Peter Rosin |
Subject: |
[PATCH] compile: clear the `eat' variable earlier. |
Date: |
Mon, 15 Nov 2010 10:33:59 +0100 |
User-agent: |
Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101027 Thunderbird/3.1.6 |
Hi!
I found this little gem in compile while reading the code. Pushed as
obvious to the msvc branch.
Cheers,
Peter
>From 89bf665808e6ed7a68957342e6343cf3261ebf14 Mon Sep 17 00:00:00 2001
From: Peter Rosin <address@hidden>
Date: Mon, 15 Nov 2010 10:27:55 +0100
Subject: [PATCH] compile: clear the `eat' variable earlier.
* lib/compile: Clear the `eat' variable earlier.
* tests/compile3.test: Prevent regressions.
Signed-off-by: Peter Rosin <address@hidden>
---
ChangeLog | 6 ++++++
lib/compile | 3 ++-
tests/compile3.test | 4 ++++
3 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ad402d0..5e326d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-15 Peter Rosin <address@hidden>
+
+ compile: clear the `eat' variable earlier.
+ * lib/compile: Clear the `eat' variable earlier.
+ * tests/compile3.test: Prevent regressions.
+
2010-10-07 Peter Rosin <address@hidden>
depcomp: add new one-pass depmode for MSVC 7 and later.
diff --git a/lib/compile b/lib/compile
index 46caccc..1c6f105 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 e376800..5a5be7e 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"
+
:
--
1.7.2.3
- [PATCH] compile: clear the `eat' variable earlier.,
Peter Rosin <=