Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1419)

Unified Diff: chrome/chrome.gyp

Issue 165140: Turning on incremental linking for 64-bit machines. (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: '' Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 22737)
+++ chrome/chrome.gyp (working copy)
@@ -4061,7 +4061,7 @@
'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
'msvs_settings': {
'VCLinkerTool': {
- 'LinkIncremental': '1', # /INCREMENTAL:NO
+ 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
},
},
},
@@ -4355,7 +4355,7 @@
'Debug': {
'msvs_settings': {
'VCLinkerTool': {
- 'LinkIncremental': '1', # /INCREMENTAL:NO
+ 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
},
},
},
@@ -4595,16 +4595,18 @@
'../views/views.gyp:views',
],
}],
- ],
- 'configurations': {
- 'Debug': {
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'LinkIncremental': '1', # /INCREMENTAL:NO
+ ['OS=="win"', {
+ 'configurations': {
+ 'Debug': {
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
+ },
+ },
},
},
- },
- },
+ }],
+ ],
},
],
}], # OS!="mac"
@@ -4864,7 +4866,7 @@
'test/automation/window_proxy.h',
],
},
- {
+ {
# Windows-only for now; this has issues with scons
# regarding use of run_all_unittests.cc.
# TODO(zork): add target to linux build.
@@ -4947,7 +4949,7 @@
],
}],
],
- },
+ },
{
# Shared library used by the in-proc browser tests.
'target_name': 'browser_tests_dll',
@@ -4978,7 +4980,7 @@
'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
'msvs_settings': {
'VCLinkerTool': {
- 'LinkIncremental': '1', # /INCREMENTAL:NO
+ 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
},
},
},
@@ -5147,7 +5149,7 @@
'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
'msvs_settings': {
'VCLinkerTool': {
- 'LinkIncremental': '1', # /INCREMENTAL:NO
+ 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
},
},
},
@@ -5296,7 +5298,7 @@
'Debug': {
'msvs_settings': {
'VCLinkerTool': {
- 'LinkIncremental': '1', # /INCREMENTAL:NO
+ 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
},
},
},
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698