diff options
| author | Stephen Hines <srhines@google.com> | 2013-09-14 05:36:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-14 05:36:55 +0000 |
| commit | c0c7ba114994c207930632a1d9f3dae92054ade2 (patch) | |
| tree | 177db8f282e7b281ce0af4d9b07e654ecd8624b2 | |
| parent | 917ae8fb30e31b065310aea214dbb5655d9a23d0 (diff) | |
| parent | 5ed5257af0efad3b0a1d57b285af10bae152dcaa (diff) | |
| download | external_llvm-c0c7ba114994c207930632a1d9f3dae92054ade2.zip external_llvm-c0c7ba114994c207930632a1d9f3dae92054ade2.tar.gz external_llvm-c0c7ba114994c207930632a1d9f3dae92054ade2.tar.bz2 | |
Merge "Only build HOST LLVM when forced to do so."
| -rw-r--r-- | llvm.mk | 2 | ||||
| -rw-r--r-- | shared_llvm.mk | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -2,8 +2,6 @@ ifeq ($(LLVM_ROOT_PATH),) $(error Must set variable LLVM_ROOT_PATH before including this! $(LOCAL_PATH)) endif -TBLGEN := $(BUILD_OUT_EXECUTABLES)/tblgen$(BUILD_EXECUTABLE_SUFFIX) - CLEAR_TBLGEN_VARS := $(LLVM_ROOT_PATH)/clear_tblgen_vars.mk LLVM_HOST_BUILD_MK := $(LLVM_ROOT_PATH)/llvm-host-build.mk LLVM_DEVICE_BUILD_MK := $(LLVM_ROOT_PATH)/llvm-device-build.mk diff --git a/shared_llvm.mk b/shared_llvm.mk index 128bc6b..3fe43fe 100644 --- a/shared_llvm.mk +++ b/shared_llvm.mk @@ -56,6 +56,7 @@ llvm_post_static_libraries := \ libLLVMSupport \ libLLVMVectorize +ifeq (true,$(FORCE_BUILD_LLVM_COMPONENTS)) # HOST LLVM shared library build include $(CLEAR_VARS) LOCAL_IS_HOST_MODULE := true @@ -80,6 +81,7 @@ endif include $(LLVM_HOST_BUILD_MK) include $(BUILD_HOST_SHARED_LIBRARY) +endif # DEVICE LLVM shared library build |