commit 30a9c351d6495f8284a7a85c343c3e4f2a38295a
author Dan Albert <danalbert@google.com> Thu Apr 09 14:41:06 2015 -0700
committer Dan Albert <danalbert@google.com> Thu Apr 09 16:38:55 2015 -0700
tree 897ecc118a1382765f857b4c6f3e091573b757a0
parent 7c2bfaf32959b3a9ebe5e59ac3734dfb36ca8bb0

Use libcompiler_rt-extras on the host too.

Clang will sometimes generate this call (dex2oat with ubsan is one
known case), and it doesn't exist in libgcc.

Change-Id: I2eb68e2a326eb0407dca03b5870077eeebca1c0a

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 69131c3..8eefa76 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -204,7 +204,7 @@
 endif
 
 # Add in libcompiler_rt for all regular device builds
-ifeq (,$(LOCAL_SDK_VERSION)$(LOCAL_IS_HOST_MODULE)$(WITHOUT_LIBCOMPILER_RT))
+ifeq (,$(LOCAL_SDK_VERSION)$(WITHOUT_LIBCOMPILER_RT))
   my_static_libraries += $(COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES)
 endif