summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-22 22:17:22 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-22 22:17:22 +0000
commit18a9799138ba0ff5ab821fd2673eb8a9a60b0642 (patch)
tree4c75aabce2eb53784d74b8c2d0d7a46fd9f2fb1e /chrome_frame
parent7c0d9cb3bae28fb0c91a25076b4aec4413ea4c44 (diff)
downloadchromium_src-18a9799138ba0ff5ab821fd2673eb8a9a60b0642.zip
chromium_src-18a9799138ba0ff5ab821fd2673eb8a9a60b0642.tar.gz
chromium_src-18a9799138ba0ff5ab821fd2673eb8a9a60b0642.tar.bz2
Disable incremental linking for chrome_frame_net_tests and chrome_frame_unittests on 32 bits OS.
Chromium XP Wine Valgrind Builder wasn't able to link these binaries anymore. TEST=links BUG=none Review URL: http://codereview.chromium.org/548115 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36909 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/chrome_frame.gyp22
1 files changed, 20 insertions, 2 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index de04bbd..280c214 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -159,7 +159,16 @@
'../chrome/chrome.gyp:automation',
'../chrome/installer/installer.gyp:installer_util',
'../google_update/google_update.gyp:google_update',
- ]
+ ],
+ 'configurations': {
+ 'Debug_Base': {
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
+ },
+ },
+ },
+ },
}],
],
},
@@ -347,7 +356,16 @@
'../chrome/chrome.gyp:chrome_dll_version',
'../chrome/installer/installer.gyp:installer_util',
'../google_update/google_update.gyp:google_update',
- ]
+ ],
+ 'configurations': {
+ 'Debug_Base': {
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
+ },
+ },
+ },
+ },
}],
],
},