From f11e4045b9c40c57cade481fc8225ab35ccb5fe2 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith@warpsharp.info>
Date: Wed, 19 Jun 2013 21:07:49 +0000
Subject: [PATCH] configure: More msvc/icl combining
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
---
configure | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/configure b/configure
index 543763f1944..f6c89acbe62 100755
--- 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
--
GitLab