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)', |
}, |
}, |
}, |