diff options
| author | Colin Cross <ccross@android.com> | 2014-02-18 23:51:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-18 23:51:21 +0000 |
| commit | b7485134a2cbecc47904988b4cfde24019ac4fa1 (patch) | |
| tree | 8ef7f8072eedd55d7a3d330e1d7f741e034ce4f4 /shared_llvm.mk | |
| parent | 1fb20b43c912416e9f9696366235a091d2acfc65 (diff) | |
| parent | 449fc26100e40d8dc9f5ca05cb111ca7f9b0d0ca (diff) | |
| download | external_llvm-b7485134a2cbecc47904988b4cfde24019ac4fa1.zip external_llvm-b7485134a2cbecc47904988b4cfde24019ac4fa1.tar.gz external_llvm-b7485134a2cbecc47904988b4cfde24019ac4fa1.tar.bz2 | |
am 449fc261: Merge "llvm: convert makefiles to support multilib build"
* commit '449fc26100e40d8dc9f5ca05cb111ca7f9b0d0ca':
llvm: convert makefiles to support multilib build
Diffstat (limited to 'shared_llvm.mk')
| -rw-r--r-- | shared_llvm.mk | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/shared_llvm.mk b/shared_llvm.mk index 718afb3..14c60b9 100644 --- a/shared_llvm.mk +++ b/shared_llvm.mk @@ -81,9 +81,10 @@ endif include $(LLVM_HOST_BUILD_MK) include $(BUILD_HOST_SHARED_LIBRARY) -#TODOArm64: Enable llvm build -#TODOMips64: Enable llvm build -ifeq ($(filter $(TARGET_ARCH),arm64 mips64),) +ifeq (,$(filter $(TARGET_ARCH),$(LLVM_SUPPORTED_ARCH))) +$(warning TODO $(TARGET_ARCH): Enable llvm build) +endif + # DEVICE LLVM shared library build include $(CLEAR_VARS) @@ -95,19 +96,10 @@ LOCAL_MODULE_TAGS := optional LOCAL_WHOLE_STATIC_LIBRARIES := \ $(llvm_pre_static_libraries) -ifeq ($(TARGET_ARCH),arm) - LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_arm_static_libraries) -else - ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64 x32)) - LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_x86_static_libraries) - else - ifeq ($(TARGET_ARCH),mips) - LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_mips_static_libraries) - else - $(error Unsupported architecture $(TARGET_ARCH)) - endif - endif -endif +LOCAL_WHOLE_STATIC_LIBRARIES_arm += $(llvm_arm_static_libraries) +LOCAL_WHOLE_STATIC_LIBRARIES_x86 += $(llvm_x86_static_libraries) +LOCAL_WHOLE_STATIC_LIBRARIES_x86_64 += $(llvm_x86_static_libraries) +LOCAL_WHOLE_STATIC_LIBRARIES_mips += $(llvm_mips_static_libraries) LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_post_static_libraries) @@ -117,6 +109,4 @@ LOCAL_SHARED_LIBRARIES := libcutils libdl libstlport include $(LLVM_DEVICE_BUILD_MK) include $(BUILD_SHARED_LIBRARY) -endif # !(arm64 || mips64) - endif # don't build in unbundled branches |