diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2012-10-24 14:05:29 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2012-10-24 14:05:29 +0000 |
| commit | 19baf068e8d113a242694003ba04508282804e8e (patch) | |
| tree | 51a38cf363fcbe0c7ece100d7326d94a9ef0a5e3 /runtime | |
| parent | 5c51fc4ad9f765ce3c8d7c1c3b27a558920f3ab0 (diff) | |
Pass LLVM_ANDROID_TOOLCHAIN_DIR if set.
This lets one build ASan runtime for ARM/Android by running
make -C tools/clang/runtime/ \
LLVM_ANDROID_TOOLCHAIN_DIR=/path/to/ndk/toolchain
in an existing build tree.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@166560 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/compiler-rt/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/runtime/compiler-rt/Makefile b/runtime/compiler-rt/Makefile index 0336c01d03..68b2941f87 100644 --- a/runtime/compiler-rt/Makefile +++ b/runtime/compiler-rt/Makefile @@ -112,6 +112,9 @@ test_source = $(LLVM_SRC_ROOT)/tools/clang/runtime/compiler-rt/clang_linux_test_ ifeq ($(call TryCompile,$(ToolDir)/clang,$(test_source),-m32),0) RuntimeLibrary.linux.Configs += asan-i386.a endif +ifneq ($(LLVM_ANDROID_TOOLCHAIN_DIR),) +RuntimeLibrary.linux.Configs += asan-arm-android.so +endif endif endif @@ -130,6 +133,7 @@ BuildRuntimeLibraries: ProjSrcRoot=$(COMPILERRT_SRC_ROOT) \ ProjObjRoot=$(PROJ_OBJ_DIR) \ CC="$(ToolDir)/clang" \ + LLVM_ANDROID_TOOLCHAIN_DIR="$(LLVM_ANDROID_TOOLCHAIN_DIR)" \ $(RuntimeDirs:%=clang_%) .PHONY: BuildRuntimeLibraries CleanRuntimeLibraries: |