diff options
| author | rogerm@google.com <rogerm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-09 00:02:40 +0000 |
|---|---|---|
| committer | rogerm@google.com <rogerm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-09 00:02:40 +0000 |
| commit | 991bc8828f4f346321615424087b81f0158eabf8 (patch) | |
| tree | 6effd15a3dd6a15c0dbebae61f66ce6877b26a22 /chrome/chrome_dll.gypi | |
| parent | adb33340eddb84cc1624da4e78e8de63ed655594 (diff) | |
| download | chromium_src-991bc8828f4f346321615424087b81f0158eabf8.zip chromium_src-991bc8828f4f346321615424087b81f0158eabf8.tar.gz chromium_src-991bc8828f4f346321615424087b81f0158eabf8.tar.bz2 | |
Revert overly-wide change in dependency chain. Now the new build step will only be enabled when the optimizations are turned on.
Review URL: http://codereview.chromium.org/7598008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95916 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_dll.gypi')
| -rw-r--r-- | chrome/chrome_dll.gypi | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index e2e8be3..be7ac9b 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -66,7 +66,7 @@ 'variables': { 'chrome_dll_target': 1, 'conditions' : [ - ['OS=="win"', { + ['OS=="win" and optimize_with_syzygy==1', { # On Windows we use build chrome_dll as an intermediate target # then have a subsequent step which either optimizes it to its # final location, or copies it to its final location, depending @@ -146,12 +146,17 @@ 'msvs_settings': { 'VCLinkerTool': { 'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib', - # On Windows we use build chrome_dll as an intermediate target - # then have a subsequent step which either optimizes it to its - # final location, or copies it to its final location, based - # on whether or not optimize_with_syzygy==1. - 'ProgramDatabaseFile': '$(OutDir)\\initial\\chrome_dll.pdb', - 'OutputFile': '$(OutDir)\\initial\\chrome.dll', + 'conditions': [ + ['optimize_with_syzygy==1', { + # When syzygy is enabled we use build chrome_dll as an + # intermediate target then have a subsequent step which + # optimizes it to its final location + 'ProgramDatabaseFile': '$(OutDir)\\initial\\chrome_dll.pdb', + 'OutputFile': '$(OutDir)\\initial\\chrome.dll', + }, { + 'ProgramDatabaseFile': '$(OutDir)\\chrome_dll.pdb', + }], + ], }, }, }], # OS=="win" |