From 680d641f2f34232d3bb9a46d1e50c72efde47fca Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Sun, 3 Feb 2008 21:59:56 +0000 Subject: [PATCH] Make gcc the default compiler. --- nt/ChangeLog | 4 ++++ nt/configure.bat | 13 +++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/nt/ChangeLog b/nt/ChangeLog index 4c5cc219fc9..505994bd1e3 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2008-02-03 Jason Rumney + + * configure.bat: Make gcc the default compiler. + 2008-02-02 Eli Zaretskii * makefile.w32-in (unidatagen-SH, unidatagen-clean-SH): Ignore diff --git a/nt/configure.bat b/nt/configure.bat index 24719c67863..ed0fa94724a 100755 --- a/nt/configure.bat +++ b/nt/configure.bat @@ -244,16 +244,17 @@ rem Auto-detect compiler if not specified, and validate GCC if chosen. if (%COMPILER%)==(cl) goto compilercheckdone if (%COMPILER%)==(gcc) goto checkgcc -echo Checking whether 'cl' is available... -echo main(){} >junk.c -cl -nologo -c junk.c -if exist junk.obj goto clOK - echo Checking whether 'gcc' is available... +echo main(){} >junk.c gcc -c junk.c -if not exist junk.o goto nocompiler +if exist junk.o goto checkgcc del junk.o +echo Checking whether 'cl' is available... +cl -nologo -c junk.c +if exist junk.obj goto clOK +goto nocompiler + :checkgcc 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 -- 2.39.5