From 30a9c351d6495f8284a7a85c343c3e4f2a38295a Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Thu, 9 Apr 2015 14:41:06 -0700 Subject: [PATCH] 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/binary.mk b/core/binary.mk index 69131c3b50..8eefa76b71 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -204,7 +204,7 @@ ifeq ($(strip $($(LOCAL_2ND_ARCH_VAR_PREFIX)WITHOUT_$(my_prefix)CLANG)),true) 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