diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2014-03-04 07:17:38 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2014-03-04 07:17:38 +0000 |
| commit | cb4f171307e0812a3c0707070e460116cbadd5f2 (patch) | |
| tree | 1fbf0ade90da88471438de8d4e08f3577d78b16c /make | |
| parent | 2b4d4bcd7e42d4419b6e720efde7143bd120fff9 (diff) | |
[asan] Fix Android configure/make build.
Mirror recent cmake changes in the configure/make build system.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@202793 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'make')
| -rw-r--r-- | make/platform/clang_linux.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/make/platform/clang_linux.mk b/make/platform/clang_linux.mk index 78f9e3afb..dbe729cd1 100644 --- a/make/platform/clang_linux.mk +++ b/make/platform/clang_linux.mk @@ -110,9 +110,10 @@ ANDROID_COMMON_FLAGS := -target arm-linux-androideabi \ --sysroot=$(LLVM_ANDROID_TOOLCHAIN_DIR)/sysroot \ -B$(LLVM_ANDROID_TOOLCHAIN_DIR) CFLAGS.asan-arm-android := $(CFLAGS) -fPIC -fno-builtin \ - $(ANDROID_COMMON_FLAGS) -fno-rtti + $(ANDROID_COMMON_FLAGS) -fno-rtti \ + -I$(ProjSrcRoot)/third_party/android/include LDFLAGS.asan-arm-android := $(LDFLAGS) $(ANDROID_COMMON_FLAGS) -ldl -lm -llog \ - -Wl,-soname=libclang_rt.asan-arm-android.so -Wl,-z,defs + -lstdc++ -Wl,-soname=libclang_rt.asan-arm-android.so -Wl,-z,defs # Use our stub SDK as the sysroot to support more portable building. For now we # just do this for the core module, because the stub SDK doesn't have |