summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-13 15:36:48 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-13 15:36:48 +0000
commit37ae86f0c4b50dc83b13da17ae1a9ef7083fa76f (patch)
treea0490ad6e949d67416e4b3bee0054dbb8fdbf09a
parentb4f907aa38193a502460e28175ce379360b5d4b1 (diff)
downloadchromium_src-37ae86f0c4b50dc83b13da17ae1a9ef7083fa76f.zip
chromium_src-37ae86f0c4b50dc83b13da17ae1a9ef7083fa76f.tar.gz
chromium_src-37ae86f0c4b50dc83b13da17ae1a9ef7083fa76f.tar.bz2
Revert r85265 "Last 6 release builds failed with either LNK1000 or LNK1318."
It wasn't related, it was an IncrediBuild issue. IB was enabled yesterday and I didn't realize it was just enabled. It has now been disabled. TBR=nsylvain@chromium.org BUG=none TEST=none Review URL: http://codereview.chromium.org/6969065 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85268 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome_frame/chrome_frame.gyp11
1 files changed, 0 insertions, 11 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index 0d10cf2..228e102 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -520,17 +520,6 @@
},
},
},
- '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',
- },
- },
- },
},
}],
],