diff options
| author | Stephan Szabo <stephan.szabo@sony.com> | 2018-11-21 21:25:15 (GMT) |
|---|---|---|
| committer | Stephan Szabo <stephan.szabo@sony.com> | 2018-11-28 15:43:28 (GMT) |
| commit | 57a78b55260616053ae0f733d2cecfffc9e7455f (patch) | |
| tree | 6281ee0421cc795f03418f85eb9152968373ae68 /Templates/MSBuild | |
| parent | f77320c12aaf74b7d22463965242a3e01d36d882 (diff) | |
| download | CMake-57a78b55260616053ae0f733d2cecfffc9e7455f.zip CMake-57a78b55260616053ae0f733d2cecfffc9e7455f.tar.gz CMake-57a78b55260616053ae0f733d2cecfffc9e7455f.tar.bz2 | |
VS: Fix support for '/guard:cf' linker flag
Original header commit v3.9.0-rc6~12^2
Although `$(VCTargetsPath)/1033/link.xml` for v140 and v141 toolsets
contains an entry for `LinkControlFlowGuard`, it does not work when used
in a `.vcxproj` file. Drop our link flag table entries for these
toolsets so that the flag will be passed via `AdditionalOptions`.
Diffstat (limited to 'Templates/MSBuild')
| -rw-r--r-- | Templates/MSBuild/FlagTables/v140_Link.json | 7 | ||||
| -rw-r--r-- | Templates/MSBuild/FlagTables/v141_Link.json | 7 |
2 files changed, 0 insertions, 14 deletions
diff --git a/Templates/MSBuild/FlagTables/v140_Link.json b/Templates/MSBuild/FlagTables/v140_Link.json index cb69124..c2a18ef 100644 --- a/Templates/MSBuild/FlagTables/v140_Link.json +++ b/Templates/MSBuild/FlagTables/v140_Link.json @@ -540,13 +540,6 @@ "flags": [] }, { - "name": "LinkControlFlowGuard", - "switch": "guard:cf", - "comment": "Enable Security Check with Guard", - "value": "Guard", - "flags": [] - }, - { "name": "LinkIncremental", "switch": "INCREMENTAL:NO", "comment": "Enable Incremental Linking", diff --git a/Templates/MSBuild/FlagTables/v141_Link.json b/Templates/MSBuild/FlagTables/v141_Link.json index c4fd8e3..d5144c8 100644 --- a/Templates/MSBuild/FlagTables/v141_Link.json +++ b/Templates/MSBuild/FlagTables/v141_Link.json @@ -547,13 +547,6 @@ "flags": [] }, { - "name": "LinkControlFlowGuard", - "switch": "guard:cf", - "comment": "Enable Security Check with Guard", - "value": "Guard", - "flags": [] - }, - { "name": "LinkIncremental", "switch": "INCREMENTAL:NO", "comment": "Enable Incremental Linking", |