diff options
| author | siggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-08 20:56:34 +0000 |
|---|---|---|
| committer | siggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-08 20:56:34 +0000 |
| commit | c059c61886ed83837821c5cbf2fd375cf8374e63 (patch) | |
| tree | b56bc42c302796bd067ee8aa86ab4ed7e1a0a443 | |
| parent | bf017de8f481e0ec0e197e2555c7baab19af7cb3 (diff) | |
| download | chromium_src-c059c61886ed83837821c5cbf2fd375cf8374e63.zip chromium_src-c059c61886ed83837821c5cbf2fd375cf8374e63.tar.gz chromium_src-c059c61886ed83837821c5cbf2fd375cf8374e63.tar.bz2 | |
Enable /PROFILE for Release builds and remove it from Debug builds.
Landing this change for rogerm@chromium.org, 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
| -rw-r--r-- | build/common.gypi | 9 | ||||
| -rw-r--r-- | chrome/chrome_dll.gypi | 9 |
2 files changed, 9 insertions, 9 deletions
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 2451e59..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" |