diff options
| author | Colin Cross <ccross@android.com> | 2014-02-04 16:26:26 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-02-06 18:38:52 -0800 |
| commit | b7325c318ecf01d4c82391c1f0a63090c8de0144 (patch) | |
| tree | 8ef7f8072eedd55d7a3d330e1d7f741e034ce4f4 /shared_llvm.mk | |
| parent | edba52bcd1a8afc5277a747727eae63023f18949 (diff) | |
| download | external_llvm-b7325c318ecf01d4c82391c1f0a63090c8de0144.zip external_llvm-b7325c318ecf01d4c82391c1f0a63090c8de0144.tar.gz external_llvm-b7325c318ecf01d4c82391c1f0a63090c8de0144.tar.bz2 | |
llvm: convert makefiles to support multilib build
Convert makefiles to allow for building two architectures at the
same time. This will also cause make checkbuild to build the target
libraries for all supported architectures.
Change-Id: Ia5e6fe5b1186a67753faafd3532ed4cb280a8b10
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 |