summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-13 13:43:38 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-13 13:43:38 +0000
commitb4f907aa38193a502460e28175ce379360b5d4b1 (patch)
treeccf982e5bf7bc5d36b1bd1678219c097faca718a /chrome_frame
parente855d81135b9a6e4d3b8b3f3d36315fc1c464393 (diff)
downloadchromium_src-b4f907aa38193a502460e28175ce379360b5d4b1.zip
chromium_src-b4f907aa38193a502460e28175ce379360b5d4b1.tar.gz
chromium_src-b4f907aa38193a502460e28175ce379360b5d4b1.tar.bz2
Last 6 release builds failed with either LNK1000 or LNK1318.
LNK1318 is transient and can be taken care of by a clobber. LNK1000 is a out of memory condition and can be worked around only by disabling incremental linking for debug build or (hopefully) disable optimization for release build. Take a chance with disabling optimization. TBR=nsylvain@chromium.org BUG=none TEST=pray it works Review URL: http://codereview.chromium.org/7014043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85265 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/chrome_frame.gyp11
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index 228e102..0d10cf2 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -520,6 +520,17 @@
},
},
},
+ 'Release': {
+ 'msvs_settings': {
+ 'VCCLCompilerTool': {
+ # It's now just too large! Since r85250 it triggers
+ # "browser.lib(host_content_settings_map.obj) : fatal error:
+ # LNK1000: Internal error during IMAGE::Pass2" during link.
+ # Disable optimization for now.
+ 'Optimization': '1',
+ },
+ },
+ },
},
}],
],