diff options
| author | Dan Albert <danalbert@google.com> | 2014-10-20 13:30:00 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-10-20 13:54:27 -0700 |
| commit | 4ffe3f5b9ffea2725dbc981230127840aee5be81 (patch) | |
| tree | 2c65b7cf75de81ae3bf0e09b63e564dd414e9516 /core | |
| parent | 1f134dd06cd12f032c833b9a43b476a9557fa8da (diff) | |
| download | build-4ffe3f5b9ffea2725dbc981230127840aee5be81.zip build-4ffe3f5b9ffea2725dbc981230127840aee5be81.tar.gz build-4ffe3f5b9ffea2725dbc981230127840aee5be81.tar.bz2 | |
We also need -rdynamic for host ASAN.
Change-Id: Iee33ca85c25d9bf126be8318a3b837074ab10076
Diffstat (limited to 'core')
| -rw-r--r-- | core/binary.mk | 2 | ||||
| -rw-r--r-- | core/clang/config.mk | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/core/binary.mk b/core/binary.mk index 6db8ae4..750e783 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -182,12 +182,14 @@ ifeq ($(strip $(LOCAL_ADDRESS_SANITIZER)),true) my_cflags += $(ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS) my_ldflags += $(ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS) ifdef LOCAL_IS_HOST_MODULE + my_ldflags += $(ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS_HOST) my_ldlibs += $(ADDRESS_SANITIZER_CONFIG_EXTRA_LDLIBS_HOST) my_shared_libraries += \ $(ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES_HOST) my_static_libraries += \ $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES_HOST) else + my_ldflags += $(ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS_TARGET) my_ldlibs += $(ADDRESS_SANITIZER_CONFIG_EXTRA_LDLIBS_TARGET) my_shared_libraries += \ $(ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES_TARGET) diff --git a/core/clang/config.mk b/core/clang/config.mk index 246690f..03b5362 100644 --- a/core/clang/config.mk +++ b/core/clang/config.mk @@ -93,10 +93,12 @@ endif ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS := -fsanitize=address ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS := -Wl,-u,__asan_preinit +ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS_HOST := -rdynamic ADDRESS_SANITIZER_CONFIG_EXTRA_LDLIBS_HOST := -lpthread -ldl ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES_HOST := ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES_HOST := libasan +ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS_TARGET := ADDRESS_SANITIZER_CONFIG_EXTRA_LDLIBS_TARGET := ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES_TARGET := libdl libasan_preload ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES_TARGET := libasan |