Index: base/allocator/allocator.gyp |
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp |
index 45a95bbdc2669a0dafdd9fa9caaf0f050d7b921b..428d68de5842b3d03ff3fa77113756033f36e45a 100644 |
--- a/base/allocator/allocator.gyp |
+++ b/base/allocator/allocator.gyp |
@@ -31,6 +31,7 @@ |
# static lib can confuse some gyp generators). Fix it once the refactoring |
# (crbug.com/564618) bring this file to a saner state (fewer conditions). |
'type': 'static_library', |
+ 'toolsets': ['host', 'target'], |
'conditions': [ |
['OS=="win" and win_use_allocator_shim==1', { |
'msvs_settings': { |
@@ -51,6 +52,16 @@ |
'sources': [ |
'allocator_shim_win.cc', |
], |
+ 'link_settings': { |
+ 'msvs_settings': { |
+ 'VCLinkerTool': { |
+ 'IgnoreDefaultLibraryNames': ['libcmtd.lib', 'libcmt.lib'], |
+ 'AdditionalDependencies': [ |
+ '<(SHARED_INTERMEDIATE_DIR)/allocator/libcmt.lib' |
+ ], |
+ }, |
+ }, |
+ }, |
'configurations': { |
'Debug_Base': { |
'msvs_settings': { |
@@ -60,20 +71,6 @@ |
}, |
}, |
}, |
- 'direct_dependent_settings': { |
- 'configurations': { |
- 'Common_Base': { |
- 'msvs_settings': { |
- 'VCLinkerTool': { |
- 'IgnoreDefaultLibraryNames': ['libcmtd.lib', 'libcmt.lib'], |
- 'AdditionalDependencies': [ |
- '<(SHARED_INTERMEDIATE_DIR)/allocator/libcmt.lib' |
- ], |
- }, |
- }, |
- }, |
- }, |
- }, |
}], # OS=="win" |
['use_allocator=="tcmalloc"', { |
# Disable the heap checker in tcmalloc. |
@@ -372,7 +369,7 @@ |
}, # 'allocator' target. |
], # targets. |
'conditions': [ |
- ['OS=="win" and component!="shared_library"', { |
+ ['OS=="win" and win_use_allocator_shim==1', { |
'targets': [ |
{ |
'target_name': 'libcmt', |