From efc90eed7768e1263c60b299e24c6293df274708 Mon Sep 17 00:00:00 2001 From: Stephan Szabo Date: Mon, 26 Nov 2018 09:11:27 -0800 Subject: 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. --- Templates/MSBuild/FlagTables/v140_CL.json | 7 ------- Templates/MSBuild/FlagTables/v141_CL.json | 7 ------- 2 files changed, 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", -- cgit v0.12