From 57a78b55260616053ae0f733d2cecfffc9e7455f Mon Sep 17 00:00:00 2001 From: Stephan Szabo Date: Wed, 21 Nov 2018 13:25:15 -0800 Subject: [PATCH] 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`. --- Templates/MSBuild/FlagTables/v140_Link.json | 7 ------- Templates/MSBuild/FlagTables/v141_Link.json | 7 ------- 2 files changed, 14 deletions(-) diff --git a/Templates/MSBuild/FlagTables/v140_Link.json b/Templates/MSBuild/FlagTables/v140_Link.json index cb69124b58..c2a18ef55a 100644 --- a/Templates/MSBuild/FlagTables/v140_Link.json +++ b/Templates/MSBuild/FlagTables/v140_Link.json @@ -539,13 +539,6 @@ "value": "SystemDlls", "flags": [] }, - { - "name": "LinkControlFlowGuard", - "switch": "guard:cf", - "comment": "Enable Security Check with Guard", - "value": "Guard", - "flags": [] - }, { "name": "LinkIncremental", "switch": "INCREMENTAL:NO", diff --git a/Templates/MSBuild/FlagTables/v141_Link.json b/Templates/MSBuild/FlagTables/v141_Link.json index c4fd8e398e..d5144c8024 100644 --- a/Templates/MSBuild/FlagTables/v141_Link.json +++ b/Templates/MSBuild/FlagTables/v141_Link.json @@ -546,13 +546,6 @@ "value": "SystemDlls", "flags": [] }, - { - "name": "LinkControlFlowGuard", - "switch": "guard:cf", - "comment": "Enable Security Check with Guard", - "value": "Guard", - "flags": [] - }, { "name": "LinkIncremental", "switch": "INCREMENTAL:NO",