Issue #25934: Default to /fp:strict for ICC builds

diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index fc9334760eacd74f1189a244115fa4c995278d9f..34938eabe9d528efede992c7de0f94692c81c96d 100644 (file)
--- 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 ca3d10fff3b78d1be0b104e138b9efcbbf2c289e..08ddaf12f05a33515e44d6404e30f4bd734539fe 100644 (file)
--- 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.