Browse code

configure: Prevent icl being incorrectly detected as msvc.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Matthew Oliver authored on 2014/11/20 16:34:37
Showing 1 changed files
... ...
@@ -3444,29 +3444,6 @@ probe_cc(){
3444 3444
         # 4509: "This form of conditional instruction is deprecated"
3445 3445
         _flags="-nologo -ignore 4509"
3446 3446
         _flags_filter=armasm_flags
3447
-    elif $_cc 2>&1 | grep -q Microsoft; then
3448
-        _type=msvc
3449
-        _ident=$($cc 2>&1 | head -n1)
3450
-        _DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>&1 | awk '\''/including/ { sub(/^.*file: */, ""); gsub(/\\/, "/"); if (!match($$0, / /)) print "$@:", $$0 }'\'' > $(@:.o=.d)'
3451
-        _DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -showIncludes -Zs'
3452
-        _cflags_speed="-O2"
3453
-        _cflags_size="-O1"
3454
-        if $_cc 2>&1 | grep -q Linker; then
3455
-            _ld_o='-out:$@'
3456
-        else
3457
-            _ld_o='-Fe$@'
3458
-        fi
3459
-        _cc_o='-Fo$@'
3460
-        _cc_e='-P -Fi$@'
3461
-        _flags_filter=msvc_flags
3462
-        _ld_lib='lib%.a'
3463
-        _ld_path='-libpath:'
3464
-        _flags='-nologo'
3465
-        _cflags='-D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -Dinline=__inline -FIstdlib.h -Dstrtoll=_strtoi64'
3466
-        if [ $pfx = hostcc ]; then
3467
-            append _cflags -Dsnprintf=_snprintf
3468
-        fi
3469
-        disable stripping
3470 3447
     elif $_cc 2>&1 | grep -q Intel; then
3471 3448
         _type=icl
3472 3449
         _ident=$($cc 2>&1 | head -n1)
... ...
@@ -3493,6 +3470,29 @@ probe_cc(){
3493 3493
         if [ $pfx = hostcc ]; then
3494 3494
             append _cflags -Dsnprintf=_snprintf
3495 3495
         fi
3496
+    elif $_cc 2>&1 | grep -q Microsoft; then
3497
+        _type=msvc
3498
+        _ident=$($cc 2>&1 | head -n1)
3499
+        _DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>&1 | awk '\''/including/ { sub(/^.*file: */, ""); gsub(/\\/, "/"); if (!match($$0, / /)) print "$@:", $$0 }'\'' > $(@:.o=.d)'
3500
+        _DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -showIncludes -Zs'
3501
+        _cflags_speed="-O2"
3502
+        _cflags_size="-O1"
3503
+        if $_cc 2>&1 | grep -q Linker; then
3504
+            _ld_o='-out:$@'
3505
+        else
3506
+            _ld_o='-Fe$@'
3507
+        fi
3508
+        _cc_o='-Fo$@'
3509
+        _cc_e='-P -Fi$@'
3510
+        _flags_filter=msvc_flags
3511
+        _ld_lib='lib%.a'
3512
+        _ld_path='-libpath:'
3513
+        _flags='-nologo'
3514
+        _cflags='-D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -Dinline=__inline -FIstdlib.h -Dstrtoll=_strtoi64'
3515
+        if [ $pfx = hostcc ]; then
3516
+            append _cflags -Dsnprintf=_snprintf
3517
+        fi
3518
+        disable stripping
3496 3519
     elif $_cc --version 2>/dev/null | grep -q ^cparser; then
3497 3520
         _type=cparser
3498 3521
         _ident=$($_cc --version | head -n1)