Enable /PROFILE for Release builds and remove it from Debug builds.
Landing this change for [email protected], original review at http://codereview.chromium.org/7541080/.
BUG=None
TEST=Incremental linking works again.
Review URL: http://codereview.chromium.org/7106002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95878 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/build/common.gypi b/build/common.gypi
index 7361a11..b7ab084 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1154,7 +1154,16 @@
],
},
'VCLinkerTool': {
+ # LinkIncremental is a tri-state boolean, where 0 means default
+ # (i.e., inherit from parent solution), 1 means false, and
+ # 2 means true.
'LinkIncremental': '1',
+ # This corresponds to the /PROFILE flag which ensures the PDB
+ # file contains FIXUP information (growing the PDB file by about
+ # 5%) but does not otherwise alter the output binary. This
+ # information is used by the Syzygy optimization tool when
+ # decomposing the release image.
+ 'Profile': 'true',
},
},
'conditions': [
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 2451e593..e2e8be3 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -152,15 +152,6 @@
# on whether or not optimize_with_syzygy==1.
'ProgramDatabaseFile': '$(OutDir)\\initial\\chrome_dll.pdb',
'OutputFile': '$(OutDir)\\initial\\chrome.dll',
- 'conditions': [
- ['fastbuild==0', {
- # This corresponds to the /PROFILE flag which ensures the PDB
- # file contains FIXUP information. This information is used
- # by the Syzygy optimization tool. Syzygy optimization is
- # disabled when fastbuild!=0.
- 'Profile': 'true',
- }],
- ],
},
},
}], # OS=="win"
