From dc63e9c676e435966b895963934b33672d44016c Mon Sep 17 00:00:00 2001
From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 29 Jan 2016 19:06:00 -0600
Subject: [PATCH] Issue #25934: Default to /fp:strict for ICC builds

---
 PCbuild/pyproject.props | 3 +++
 PCbuild/python.props    | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index fc9334760e..34938eabe9 100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -49,6 +49,9 @@
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     </ClCompile>
+    <ClCompile Condition="$(ICCBuild) == 'true'">
+      <FloatingPointModel>Strict</FloatingPointModel>
+    </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
diff --git a/PCbuild/python.props b/PCbuild/python.props
index ca3d10fff3..08ddaf12f0 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -11,6 +11,8 @@
     Give a default for BasePlatformToolset as well, it's used by ICC and ignored otherwise
     -->
     <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and '$(PlatformToolset)' != 'v90'">v90</BasePlatformToolset>
+    <ICCBuild>false</ICCBuild>
+    <ICCBuild Condition="$(PlatformToolset.StartsWith('Intel C++ Compiler'))">true</ICCBuild>
     <!--
     Convincing MSVC/MSBuild to prefer our platform names is too difficult,
     so we define our own constant ArchName and use wherever we need it.
-- 
2.50.1