From db35e3cfd606a156cbb518af19603da7f22c26d8 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 24 Jan 2019 13:11:14 -0500 Subject: VS: Fix support for '/guard:cf' linker flag for v142 Apply the change from commit 57a78b5526 (VS: Fix support for '/guard:cf' linker flag, 2018-11-21) to the v142 flag table. Although `$(VCTargetsPath)/1033/link.xml` contains an entry for `LinkControlFlowGuard`, it does not work when used in a `.vcxproj` file (at least as of v140 and v141). Drop our link flag table entries for these toolsets so that the flag will be passed via `AdditionalOptions`. --- Templates/MSBuild/FlagTables/v142_Link.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Templates/MSBuild/FlagTables/v142_Link.json b/Templates/MSBuild/FlagTables/v142_Link.json index c4fd8e3..d5144c8 100644 --- a/Templates/MSBuild/FlagTables/v142_Link.json +++ b/Templates/MSBuild/FlagTables/v142_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", -- cgit v0.12