Index: build/mac/asan.gyp |
diff --git a/build/mac/asan.gyp b/build/mac/asan.gyp |
index 73e86416c6981ffffd6f9fa47985f16e6befffd3..f5562fefb0bb837a98c6358ca9a77a363c2100dc 100644 |
--- a/build/mac/asan.gyp |
+++ b/build/mac/asan.gyp |
@@ -13,7 +13,11 @@ |
'prune_self_dependency': 1, |
# Path is relative to this GYP file. |
'asan_rtl_mask_path': |
- '../../third_party/llvm-build/Release+Asserts/lib/clang/*/lib/darwin/libclang_rt.asan_osx_dynamic.dylib', |
+ '../../third_party/llvm-build/Release+Asserts/lib/clang/*/lib/darwin', |
+ 'asan_osx_dynamic': |
+ '<(asan_rtl_mask_path)/libclang_rt.asan_osx_dynamic.dylib', |
+ 'asan_iossim_dynamic': |
+ '<(asan_rtl_mask_path)/libclang_rt.asan_iossim_dynamic.dylib', |
}, |
'conditions': [ |
['OS=="mac"', { |
@@ -21,11 +25,37 @@ |
{ |
'destination': '<(PRODUCT_DIR)', |
'files': [ |
- '<!(/bin/ls <(asan_rtl_mask_path))', |
+ '<!(/bin/ls <(asan_osx_dynamic))', |
Nico
2014/04/05 18:40:18
Out of curiosity, why do you need the call to ls?
Alexander Potapenko
2014/04/08 08:31:10
IIUC 'copies' doesn't support wildcards, does it?
|
], |
}, |
], |
}], |
+ # ASan works with iOS simulator only, not bare-metal iOS. |
+ ['OS=="ios" and target_arch=="ia32"', { |
+ 'toolsets': ['host', 'target'], |
+ 'target_conditions': [ |
Nico
2014/04/05 18:40:18
nit: I think you can move target_conditions inside
Alexander Potapenko
2014/04/08 08:31:10
Done.
|
+ ['_toolset=="host"', { |
+ 'copies': [ |
+ { |
+ 'destination': '<(PRODUCT_DIR)', |
+ 'files': [ |
+ '<!(/bin/ls <(asan_osx_dynamic))', |
+ ], |
+ }, |
+ ], |
+ }], |
+ ['_toolset=="target"', { |
+ 'copies': [ |
+ { |
+ 'destination': '<(PRODUCT_DIR)', |
+ 'files': [ |
+ '<!(/bin/ls <(asan_iossim_dynamic))', |
+ ], |
+ }, |
+ ], |
+ }], |
+ ], |
+ }], |
], |
}, |
], |