From 04dbc2d02211f5953a62c710b8df4185e2000ffd Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov Date: Wed, 24 Oct 2012 14:05:29 +0000 Subject: [PATCH] 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. llvm-svn: 166560 --- clang/runtime/compiler-rt/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/clang/runtime/compiler-rt/Makefile b/clang/runtime/compiler-rt/Makefile index 0336c01d0384..68b2941f8769 100644 --- a/clang/runtime/compiler-rt/Makefile +++ b/clang/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: