Browse Source

Merge topic 'msvc-link-merge-fix'

a9f992434d VS: Remove the /MERGE flag from FlagTables

Acked-by: Kitware Robot <[email protected]>
Merge-request: !6205
Brad King 4 years ago
parent
commit
5e26887c35

+ 0 - 9
Templates/MSBuild/FlagTables/v10_Link.json

@@ -1089,15 +1089,6 @@
       "UserValue"
     ]
   },
-  {
-    "name": "MergeSections",
-    "switch": "MERGE:",
-    "comment": "Merge Sections",
-    "value": "",
-    "flags": [
-      "UserValue"
-    ]
-  },
   {
     "name": "LinkKeyFile",
     "switch": "KEYFILE:",

+ 0 - 9
Templates/MSBuild/FlagTables/v11_Link.json

@@ -1224,15 +1224,6 @@
       "UserValue"
     ]
   },
-  {
-    "name": "MergeSections",
-    "switch": "MERGE:",
-    "comment": "Merge Sections",
-    "value": "",
-    "flags": [
-      "UserValue"
-    ]
-  },
   {
     "name": "LinkKeyFile",
     "switch": "KEYFILE:",

+ 0 - 9
Templates/MSBuild/FlagTables/v12_Link.json

@@ -1224,15 +1224,6 @@
       "UserValue"
     ]
   },
-  {
-    "name": "MergeSections",
-    "switch": "MERGE:",
-    "comment": "Merge Sections",
-    "value": "",
-    "flags": [
-      "UserValue"
-    ]
-  },
   {
     "name": "LinkKeyFile",
     "switch": "KEYFILE:",

+ 0 - 9
Templates/MSBuild/FlagTables/v140_Link.json

@@ -1268,15 +1268,6 @@
       "UserValue"
     ]
   },
-  {
-    "name": "MergeSections",
-    "switch": "MERGE:",
-    "comment": "Merge Sections",
-    "value": "",
-    "flags": [
-      "UserValue"
-    ]
-  },
   {
     "name": "LinkKeyFile",
     "switch": "KEYFILE:",

+ 0 - 9
Templates/MSBuild/FlagTables/v141_Link.json

@@ -1275,15 +1275,6 @@
       "UserValue"
     ]
   },
-  {
-    "name": "MergeSections",
-    "switch": "MERGE:",
-    "comment": "Merge Sections",
-    "value": "",
-    "flags": [
-      "UserValue"
-    ]
-  },
   {
     "name": "LinkKeyFile",
     "switch": "KEYFILE:",

+ 0 - 9
Templates/MSBuild/FlagTables/v142_Link.json

@@ -1282,15 +1282,6 @@
       "UserValue"
     ]
   },
-  {
-    "name": "MergeSections",
-    "switch": "MERGE:",
-    "comment": "Merge Sections",
-    "value": "",
-    "flags": [
-      "UserValue"
-    ]
-  },
   {
     "name": "LinkKeyFile",
     "switch": "KEYFILE:",