diff options
author | Stephan Szabo <stephan.szabo@sony.com> | 2018-11-26 17:11:27 (GMT) |
---|---|---|
committer | Stephan Szabo <stephan.szabo@sony.com> | 2018-11-28 15:43:30 (GMT) |
commit | efc90eed7768e1263c60b299e24c6293df274708 (patch) | |
tree | a7cbe1d26084878e0fbea2f1ce3eff3e4002e5f3 /Templates/MSBuild | |
parent | 36b7fc7db6a64b4537bea38640e324c9f283a168 (diff) | |
download | CMake-efc90eed7768e1263c60b299e24c6293df274708.zip CMake-efc90eed7768e1263c60b299e24c6293df274708.tar.gz CMake-efc90eed7768e1263c60b299e24c6293df274708.tar.bz2 |
VS: Fix regressed mapping for the cl `/Os` compiler flag
Original header commit v3.6.0-rc3~8^2
In commit v3.6.0-rc1~279^2~10 (VS: in Clang/C2 toolset, setup correct
compiler settings, 2016-02-18) a flag mapping was added for the clang
`-Os` flag. However, this collides with a mapping we already had for
the MSVC flag of the same name. This is a symptom of a larger problem
in that the VS generators need a per-toolset flag map (issue #16153).
For now, simply drop the new mapping and drop `-Os` from clang compiler
flags in the MinSizeRel configuration.
Diffstat (limited to 'Templates/MSBuild')
-rw-r--r-- | Templates/MSBuild/FlagTables/v140_CL.json | 7 | ||||
-rw-r--r-- | Templates/MSBuild/FlagTables/v141_CL.json | 7 |
2 files changed, 0 insertions, 14 deletions
diff --git a/Templates/MSBuild/FlagTables/v140_CL.json b/Templates/MSBuild/FlagTables/v140_CL.json index 4c2be74..f75cff5 100644 --- a/Templates/MSBuild/FlagTables/v140_CL.json +++ b/Templates/MSBuild/FlagTables/v140_CL.json @@ -113,13 +113,6 @@ }, { "name": "Optimization", - "switch": "Os", - "comment": "Minimize Size", - "value": "MinSize", - "flags": [] - }, - { - "name": "Optimization", "switch": "O1", "comment": "Minimize Size", "value": "MinSpace", diff --git a/Templates/MSBuild/FlagTables/v141_CL.json b/Templates/MSBuild/FlagTables/v141_CL.json index a3e0f54..db4380e 100644 --- a/Templates/MSBuild/FlagTables/v141_CL.json +++ b/Templates/MSBuild/FlagTables/v141_CL.json @@ -134,13 +134,6 @@ }, { "name": "Optimization", - "switch": "Os", - "comment": "Minimize Size", - "value": "MinSize", - "flags": [] - }, - { - "name": "Optimization", "switch": "O1", "comment": "Maximum Optimization (Favor Size)", "value": "MinSpace", |