configure.bat: Search for icl.exe before cl.exe

The Intel compiler's compilervars.bat also puts the MSVC compiler in PATH, so cl.exe was always being found first. Change-Id: I72e524da10fb0e221c4530a3e5c1a4a347c3f878 Reviewed-by: Oswald Buddenhagen <[email protected]>
ZhanStep · Jul 17, 2015 · 0d9db58 · 0d9db58
1 parent 78d8759
commit 0d9db58
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/configure.bat b/configure.bat
@@ -60,16 +60,16 @@ if errorlevel 1 goto exit
 echo #### Generated by configure.bat - DO NOT EDIT! ####> Makefile
 echo/>> Makefile
 for /f "tokens=3 usebackq" %%V in (`findstr QT_VERSION_STR %QTSRC%src\corelib\global\qglobal.h`) do @echo QTVERSION = %%~V>> Makefile
-if not "%cl.exe%" == "" (
-    echo CXX = cl>>Makefile
-    echo EXTRA_CXXFLAGS =>>Makefile
+if not "%icl.exe%" == "" (
+    echo CXX = icl>>Makefile
+    echo EXTRA_CXXFLAGS = /Zc:forScope>>Makefile
     rem This must have a trailing space.
     echo QTSRC = %QTSRC% >> Makefile
     set tmpl=win32
     set make=nmake
-) else if not "%icl.exe%" == "" (
-    echo CXX = icl>>Makefile
-    echo EXTRA_CXXFLAGS = /Zc:forScope>>Makefile
+) else if not "%cl.exe%" == "" (
+    echo CXX = cl>>Makefile
+    echo EXTRA_CXXFLAGS =>>Makefile
     rem This must have a trailing space.
     echo QTSRC = %QTSRC% >> Makefile
     set tmpl=win32