From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 11 Feb 2008 21:18:06 +0000 (+0000)
Subject: (checkgcc): Move "del junk.o" to here, and make it conditional on existence
X-Git-Tag: emacs-pretest-23.0.90~7994
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1046da1cf4056438b0e5ce2aa96725fb6999b454;p=emacs.git

(checkgcc): Move "del junk.o" to here, and make it conditional on existence
of junk.o.  If %nocygwin% is already set to Y, skip to chkapiN instead of
chkapi.
(chkapi): Move "rm -f junk.c junk.o" to here.
(chkapiN): New label.
---

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 5aca8fbeddc..847bb2af500 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-11  Eli Zaretskii  <eliz@gnu.org>
+
+	* configure.bat (checkgcc): Move "del junk.o" to here, and make it
+	conditional on existence of junk.o.  If %nocygwin% is already set
+	to Y, skip to chkapiN instead of chkapi.
+	(chkapi): Move "rm -f junk.c junk.o" to here.
+	(chkapiN): New label.
+
 2008-02-11  Jason Rumney  <jasonr@gnu.org>
 
 	* makefile.w32-in: Remove unidata-gen related rules.
diff --git a/nt/configure.bat b/nt/configure.bat
index ace5996f07e..98ff0567142 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -248,7 +248,6 @@ echo Checking whether 'gcc' is available...
 echo main(){} >junk.c
 gcc -c junk.c
 if exist junk.o goto checkgcc
-del junk.o
 
 echo Checking whether 'cl' is available...
 cl -nologo -c junk.c
@@ -256,11 +255,12 @@ if exist junk.obj goto clOK
 goto nocompiler
 
 :checkgcc
+if exist junk.o del junk.o
 Rem WARNING -- COMMAND.COM on some systems only looks at the first
 Rem            8 characters of a label.  So do NOT be tempted to change
 Rem            chkapi* into something fancier like checkw32api
 Rem You HAVE been warned!
-if (%nocygwin%) == (Y) goto chkapi
+if (%nocygwin%) == (Y) goto chkapiN
 echo Checking whether gcc requires '-mno-cygwin'...
 echo #include "cygwin/version.h" >junk.c
 echo main(){} >>junk.c
@@ -270,11 +270,12 @@ if not exist junk.o goto chkapi
 echo gcc -mno-cygwin -c junk.c >>config.log
 gcc -mno-cygwin -c junk.c >>config.log 2>&1
 if exist junk.o set nocygwin=Y
-rm -f junk.c junk.o
 
 :chkapi
 echo The failed program was: >>config.log
 type junk.c >>config.log
+:chkapiN
+rm -f junk.c junk.o
 rem ----------------------------------------------------------------------
 rem   Older versions of the Windows API headers either don't have any of
 rem   the IMAGE_xxx definitions (the headers that come with Cygwin b20.1