Chromium Code Reviews| Index: build/common.gypi |
| diff --git a/build/common.gypi b/build/common.gypi |
| index 594b9a21e6aeef80ccc4be111195fa9d5409f0d8..874cba503c327592359337e891db05add3d586ee 100644 |
| --- a/build/common.gypi |
| +++ b/build/common.gypi |
| @@ -1607,6 +1607,9 @@ |
| # Turn on multiple dll by default on Windows when in static_library. |
| 'chrome_multiple_dll%': 1, |
| }], |
| + ['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 |
| @@ -1817,12 +1820,7 @@ |
| ], |
| }], |
| - ['asan==1 and OS=="win"', { |
| - # TODO(hans): Remove once users set syzyasan (crbug.com/343960). |
| - 'syzyasan%': 1, |
| - }], |
| - ['asan==1 and OS!="win"', { |
| - # TODO(hans): Windows should use Clang-based ASan (crbug.com/343960). |
| + ['asan==1', { |
| 'clang%': 1, |
| }], |
| ['asan==1 and OS=="mac"', { |
| @@ -1979,7 +1977,7 @@ |
| ], |
| }], |
| - ['OS=="win" and clang==1', { |
| + ['OS=="win" and (clang==1 or asan==1)', { |
|
Nico
2014/02/21 22:22:40
If you put the "if asan = 1 then clang = 1" block
hans
2014/02/21 22:33:00
I'll see if I can do this in a follow-up. This is
|
| 'chromium_win_pch': 0, |
| }], |
| @@ -4821,6 +4819,37 @@ |
| }], |
| ], |
| }], |
| + ['asan==1', { |
| + # ASan on Windows is a work in progress and very experimental. |
| + # See crbug.com/82385. |
|
Nico
2014/02/21 22:22:40
Maybe have a separate bug for asan/win and make it
hans
2014/02/21 22:33:00
Done.
|
| + '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', |
| + ], |
| + }, |
| + }], |
| + ], |
| + }], |
| ], |
| }, |
| }, |