Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index ddd6546f379437be9af2d050f59f8c5e0091df40..048f453020db8c52547b77281afd1722e7f978d6 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -1579,6 +1579,9 @@ |
# Turn on multiple dll by default on Windows when in static_library. |
'chrome_multiple_dll%': 1, |
}], |
+ ['clang==1 and asan==1', { |
+ 'win_use_allocator_shim%': 0, |
+ }], |
['component=="shared_library" and "<(GENERATOR)"=="ninja"', { |
# Only enabled by default for ninja because it's buggy in VS. |
# Not enabled for component=static_library because some targets |
@@ -2321,8 +2324,8 @@ |
'ENABLE_EGLIMAGE=1', |
], |
}], |
- ['asan==1 and OS=="win"', { |
- # Since asan on windows uses Syzygy, we need /PROFILE turned on to |
+ ['asan==1 and OS=="win" and clang!=1', { |
Nico
2014/02/14 01:27:18
can we replace "asan==1" on windows with "syszyasa
|
+ # For SyzyAsan, we need /PROFILE turned on to |
# produce appropriate pdbs. |
'msvs_settings': { |
'VCLinkerTool': { |
@@ -4727,6 +4730,37 @@ |
}], |
], |
}], |
+ ['clang==1 and asan==1', { |
+ # Building with Clang on Windows is a work in progress and very |
+ # experimental. See crbug.com/82385. |
+ 'VCCLCompilerTool': { |
+ 'AdditionalOptions': [ |
+ '-fsanitize=address', |
+ ], |
+ }, |
+ 'VCLinkerTool': { |
+ 'AdditionalLibraryDirectories': [ |
+ # TODO(hans): If make_clang_dir is absolute, this breaks. |
+ '<(DEPTH)/<(make_clang_dir)/lib/clang/3.5/lib/windows', |
+ ], |
+ }, |
+ 'target_conditions': [ |
+ ['_type=="executable"', { |
+ 'VCLinkerTool': { |
+ 'AdditionalDependencies': [ |
+ 'clang_rt.asan-i386.lib', |
+ ], |
+ }, |
+ }], |
+ ['_type=="shared_library" or _type=="loadable_module"', { |
+ 'VCLinkerTool': { |
+ 'AdditionalDependencies': [ |
+ 'clang_rt.asan_dll_thunk-i386.lib', |
+ ], |
+ }, |
+ }], |
+ ], |
+ }], |
], |
}, |
}, |