configure: More msvc/icl combining
authorAlex Smith <alex.smith@warpsharp.info>
Wed, 19 Jun 2013 21:07:49 +0000 (21:07 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sat, 22 Jun 2013 21:00:57 +0000 (17:00 -0400)
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
configure

index 543763f194420d496737782f75c1fcbea6b23410..f6c89acbe6284887a9fcaa78e130f5dffa81a7e7 100755 (executable)
--- a/configure
+++ b/configure
@@ -3945,14 +3945,14 @@ elif enabled tms470; then
     add_cflags -pds=824 -pds=837
 elif enabled pathscale; then
     add_cflags -fstrict-overflow -OPT:wrap_around_unsafe_opt=OFF
-elif enabled msvc; then
+elif enabled_any msvc icl; then
     enabled x86_32 && disable aligned_stack
-elif enabled icl; then
-    enabled x86_32 && disable aligned_stack
-    # basically -fstrict-aliasing for icl that doesn't work (correctly) on 13.x+
-    check_cpp_condition "windows.h" "__ICL < 1300" && add_cflags -Qansi-alias
-    # icl will pass the inline asm tests but inline asm is currently not supported (build will fail)
-    disable inline_asm
+    if enabled icl; then
+        # basically -fstrict-aliasing for icl that doesn't work (correctly) on 13.x+
+        check_cpp_condition "windows.h" "__ICL < 1300" && add_cflags -Qansi-alias
+        # icl will pass the inline asm tests but inline asm is currently not supported (build will fail)
+        disable inline_asm
+    fi
 fi
 
 case $target_os in