diff options
| author | Stephen Hines <srhines@google.com> | 2014-04-23 16:57:46 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-04-24 15:53:16 -0700 |
| commit | 36b56886974eae4f9c5ebc96befd3e7bfe5de338 (patch) | |
| tree | e6cfb69fbbd937f450eeb83bfb83b9da3b01275a /shared_llvm.mk | |
| parent | 69a8640022b04415ae9fac62f8ab090601d8f889 (diff) | |
| download | external_llvm-36b56886974eae4f9c5ebc96befd3e7bfe5de338.zip external_llvm-36b56886974eae4f9c5ebc96befd3e7bfe5de338.tar.gz external_llvm-36b56886974eae4f9c5ebc96befd3e7bfe5de338.tar.bz2 | |
Update to LLVM 3.5a.
Change-Id: Ifadecab779f128e62e430c2b4f6ddd84953ed617
Diffstat (limited to 'shared_llvm.mk')
| -rw-r--r-- | shared_llvm.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/shared_llvm.mk b/shared_llvm.mk index b0299e8..8948c39 100644 --- a/shared_llvm.mk +++ b/shared_llvm.mk @@ -105,6 +105,7 @@ ifeq (,$(filter $(TARGET_ARCH),$(LLVM_SUPPORTED_ARCH))) $(warning TODO $(TARGET_ARCH): Enable llvm build) endif +ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS)) # DEVICE LLVM shared library build include $(CLEAR_VARS) @@ -125,9 +126,12 @@ LOCAL_WHOLE_STATIC_LIBRARIES_arm64 += $(llvm_arm64_static_libraries) LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_post_static_libraries) #LOCAL_LDLIBS := -ldl -lpthread -LOCAL_SHARED_LIBRARIES := libcutils libdl libstlport +LOCAL_SHARED_LIBRARIES := libcutils libdl libc++ include $(LLVM_DEVICE_BUILD_MK) include $(BUILD_SHARED_LIBRARY) +endif + endif # don't build in unbundled branches + |