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 | 2821fb7d18503a4f7e9ae5c86e3da72ffb609ca4 (patch) | |
| tree | f7bbc1d1e150483bfd6d05a70ebe5b1363153e3e | |
| parent | 7ffeea4ef36aba706cea3beecba7aa865441ab6f (diff) | |
| download | bcm5719-llvm-2821fb7d18503a4f7e9ae5c86e3da72ffb609ca4.tar.gz bcm5719-llvm-2821fb7d18503a4f7e9ae5c86e3da72ffb609ca4.zip | |
[asan] Fix Android configure/make build.
Mirror recent cmake changes in the configure/make build system.
llvm-svn: 202793
| -rw-r--r-- | compiler-rt/make/platform/clang_linux.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler-rt/make/platform/clang_linux.mk b/compiler-rt/make/platform/clang_linux.mk index 78f9e3afb35..dbe729cd1d9 100644 --- a/compiler-rt/make/platform/clang_linux.mk +++ b/compiler-rt/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 |
