diff options
| author | Bill Yi <byi@google.com> | 2014-10-22 08:45:57 -0700 |
|---|---|---|
| committer | Bill Yi <byi@google.com> | 2014-10-22 08:45:57 -0700 |
| commit | 13466f0f79e42efa17777ffad6c12088c1f3cf62 (patch) | |
| tree | d2f94ac4218da6aab82306c3ae3c5566bc4f3e62 /core/clang | |
| parent | c6a12d776ae548c4290d76cb157807acb1ffb9f1 (diff) | |
| parent | 66b3e31936b99436e01c473dca492126eea3e336 (diff) | |
| download | build-13466f0f79e42efa17777ffad6c12088c1f3cf62.zip build-13466f0f79e42efa17777ffad6c12088c1f3cf62.tar.gz build-13466f0f79e42efa17777ffad6c12088c1f3cf62.tar.bz2 | |
Merge commit '66b3e31936b99436e01c473dca492126eea3e336' into HEAD
Diffstat (limited to 'core/clang')
| -rw-r--r-- | core/clang/config.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/clang/config.mk b/core/clang/config.mk index 54466a7..5a76049 100644 --- a/core/clang/config.mk +++ b/core/clang/config.mk @@ -14,8 +14,8 @@ CLANG_CXX := $(LLVM_PREBUILTS_PATH)/clang++$(BUILD_EXECUTABLE_SUFFIX) LLVM_AS := $(LLVM_PREBUILTS_PATH)/llvm-as$(BUILD_EXECUTABLE_SUFFIX) LLVM_LINK := $(LLVM_PREBUILTS_PATH)/llvm-link$(BUILD_EXECUTABLE_SUFFIX) -CLANG_TBLGEN := $(HOST_OUT_EXECUTABLES)/clang-tblgen$(BUILD_EXECUTABLE_SUFFIX) -LLVM_TBLGEN := $(HOST_OUT_EXECUTABLES)/llvm-tblgen$(BUILD_EXECUTABLE_SUFFIX) +CLANG_TBLGEN := $(BUILD_OUT_EXECUTABLES)/clang-tblgen$(BUILD_EXECUTABLE_SUFFIX) +LLVM_TBLGEN := $(BUILD_OUT_EXECUTABLES)/llvm-tblgen$(BUILD_EXECUTABLE_SUFFIX) # The C/C++ compiler can be wrapped by setting the CC/CXX_WRAPPER vars. ifdef CC_WRAPPER @@ -95,7 +95,8 @@ include $(BUILD_SYSTEM)/clang/TARGET_$(TARGET_2ND_ARCH).mk endif # Address sanitizer clang config -ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS := -fsanitize=address +ADDRESS_SANITIZER_RUNTIME_LIBRARY := libclang_rt.asan_$(TARGET_ARCH)_android +ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS := -fsanitize=address -fno-omit-frame-pointer ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS := -Wl,-u,__asan_preinit ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS_HOST := -rdynamic @@ -105,7 +106,7 @@ 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_SHARED_LIBRARIES_TARGET := libdl $(ADDRESS_SANITIZER_RUNTIME_LIBRARY) ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES_TARGET := libasan # This allows us to use the superset of functionality that compiler-rt |