build,win: limit LTCG only to the main node tagert

refack · refack · commit 3521f8abd8e3 · 2018-10-30T16:21:14.000-04:00
diff --git a/common.gypi b/common.gypi
@@ -151,9 +151,6 @@
             'OmitFramePointers': 'false',
             'BasicRuntimeChecks': 3, # /RTC1
             'MultiProcessorCompilation': 'true',
-            'AdditionalOptions': [
-              '/bigobj', # prevent error C1128 in VS2015
-            ],
           },
           'VCLinkerTool': {
             'LinkIncremental': 2, # enable incremental linking
@@ -229,12 +226,7 @@
                 ]
               },
               'VCLinkerTool': {
-                'OptimizeReferences': 2, # /OPT:REF
-                'EnableCOMDATFolding': 2, # /OPT:ICF
                 'LinkIncremental': 1, # disable incremental linking
-                'AdditionalOptions': [
-                  '/LTCG:INCREMENTAL', # incremental link-time code generation
-                ]
               }
             }
           }, {
@@ -258,8 +250,6 @@
             'EnableIntrinsicFunctions': 'true',
             'RuntimeTypeInfo': 'false',
             'MultiProcessorCompilation': 'true',
-            'AdditionalOptions': [
-            ],
           }
         }
       }
diff --git a/node.gyp b/node.gyp
@@ -244,9 +244,29 @@
       ],
 
       # - "C4244: conversion from 'type1' to 'type2', possible loss of data"
-      #   Ususaly safe. Disable for `dep`, enable for `src`
+      #   Disabled for `/deps/`, so re-enable for `/src/`.
       'msvs_disabled_warnings!': [4244],
-
+      'configurations': {
+        'Release': {
+          'msvs_settings': {
+            'conditions': [
+              ['node_with_ltcg=="true"', {
+                'VCLinkerTool': {
+                  'OptimizeReferences': 2, # /OPT:REF
+                  'EnableCOMDATFolding': 2, # /OPT:ICF
+                  'AdditionalOptions': [
+                    '/LTCG:INCREMENTAL', # incremental link-time code generation
+                  ]
+                }
+              }, {
+                'VCLinkerTool': {
+                  'LinkIncremental': 2 # enable incremental linking
+                },
+              }],
+            ]
+          },
+        },
+      },
       'conditions': [
         [ 'node_intermediate_lib_type=="static_library" and node_shared=="true" and OS=="aix"', {
           # For AIX, shared lib is linked by static lib and .exp. In the

Original file line number	Diff line number	Diff line change
`@@ -151,9 +151,6 @@`
`151`	`151`	`'OmitFramePointers': 'false',`
`152`	`152`	`'BasicRuntimeChecks': 3, # /RTC1`
`153`	`153`	`'MultiProcessorCompilation': 'true',`
`154`		`- 'AdditionalOptions': [`
`155`		`- '/bigobj', # prevent error C1128 in VS2015`
`156`		`- ],`
`157`	`154`	`},`
`158`	`155`	`'VCLinkerTool': {`
`159`	`156`	`'LinkIncremental': 2, # enable incremental linking`
`@@ -229,12 +226,7 @@`
`229`	`226`	`]`
`230`	`227`	`},`
`231`	`228`	`'VCLinkerTool': {`
`232`		`- 'OptimizeReferences': 2, # /OPT:REF`
`233`		`- 'EnableCOMDATFolding': 2, # /OPT:ICF`
`234`	`229`	`'LinkIncremental': 1, # disable incremental linking`
`235`		`- 'AdditionalOptions': [`
`236`		`- '/LTCG:INCREMENTAL', # incremental link-time code generation`
`237`		`- ]`
`238`	`230`	`}`
`239`	`231`	`}`
`240`	`232`	`}, {`
`@@ -258,8 +250,6 @@`
`258`	`250`	`'EnableIntrinsicFunctions': 'true',`
`259`	`251`	`'RuntimeTypeInfo': 'false',`
`260`	`252`	`'MultiProcessorCompilation': 'true',`
`261`		`- 'AdditionalOptions': [`
`262`		`- ],`
`263`	`253`	`}`
`264`	`254`	`}`
`265`	`255`	`}`