diff options
| author | Stephen Hines <srhines@google.com> | 2013-09-23 17:51:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-23 17:51:13 -0700 |
| commit | a91a22bcbadfb1aa06aec5077e8f5ce9d40a8410 (patch) | |
| tree | 856d098cfa0690ca1e8f294cc72856e6ca584a95 /shared_llvm.mk | |
| parent | d79086a173e809334532b367ee04dd9e32596f8f (diff) | |
| parent | 8e708fafb747b3f1e536d87016bb67c118fb5b0d (diff) | |
| download | external_llvm-a91a22bcbadfb1aa06aec5077e8f5ce9d40a8410.zip external_llvm-a91a22bcbadfb1aa06aec5077e8f5ce9d40a8410.tar.gz external_llvm-a91a22bcbadfb1aa06aec5077e8f5ce9d40a8410.tar.bz2 | |
am 8e708faf: am 5edef2e8: Merge "x86_64/x32: Avoid early fail on x32 or x86_64 build"
* commit '8e708fafb747b3f1e536d87016bb67c118fb5b0d':
x86_64/x32: Avoid early fail on x32 or x86_64 build
Diffstat (limited to 'shared_llvm.mk')
| -rw-r--r-- | shared_llvm.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/shared_llvm.mk b/shared_llvm.mk index 128bc6b..9519cbe 100644 --- a/shared_llvm.mk +++ b/shared_llvm.mk @@ -96,7 +96,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ ifeq ($(TARGET_ARCH),arm) LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_arm_static_libraries) else - ifeq ($(TARGET_ARCH),x86) + ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64 x32)) LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_x86_static_libraries) else ifeq ($(TARGET_ARCH),mips) |