summaryrefslogtreecommitdiff
path: root/Templates
diff options
context:
space:
mode:
authorStephan Szabo <stephan.szabo@sony.com>2018-11-26 09:11:27 -0800
committerStephan Szabo <stephan.szabo@sony.com>2018-11-28 07:43:30 -0800
commitefc90eed7768e1263c60b299e24c6293df274708 (patch)
treea7cbe1d26084878e0fbea2f1ce3eff3e4002e5f3 /Templates
parent36b7fc7db6a64b4537bea38640e324c9f283a168 (diff)
downloadcmake-efc90eed7768e1263c60b299e24c6293df274708.tar.gz
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')
-rw-r--r--Templates/MSBuild/FlagTables/v140_CL.json7
-rw-r--r--Templates/MSBuild/FlagTables/v141_CL.json7
2 files changed, 0 insertions, 14 deletions
diff --git a/Templates/MSBuild/FlagTables/v140_CL.json b/Templates/MSBuild/FlagTables/v140_CL.json
index 4c2be74b6d..f75cff52e7 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 a3e0f549a0..db4380ecdb 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",