diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2016-01-30 01:06:00 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2016-01-30 01:06:00 (GMT) |
| commit | dc63e9c676e435966b895963934b33672d44016c (patch) | |
| tree | a2112a837b9a710c4b9391f053395099c256adf5 | |
| parent | fd8e8504e27ce4b53c0ae6acfd3cf54f67fe98ce (diff) | |
| download | cpython-dc63e9c676e435966b895963934b33672d44016c.zip cpython-dc63e9c676e435966b895963934b33672d44016c.tar.gz cpython-dc63e9c676e435966b895963934b33672d44016c.tar.bz2 | |
Issue #25934: Default to /fp:strict for ICC builds
| -rw-r--r-- | PCbuild/pyproject.props | 3 | ||||
| -rw-r--r-- | PCbuild/python.props | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index fc93347..34938ea 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 ca3d10f..08ddaf1 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. |