Merge changes I52805f5d,Ifb16ed87

* changes:
  Allow projects to exclude from libcrt_builtins
  Move libgcc to libcrt.builtins
This commit is contained in:
Yi Kong
2018-11-13 21:56:47 +00:00
committed by Gerrit Code Review
15 changed files with 27 additions and 15 deletions

View File

@@ -396,13 +396,6 @@ endif
include $(BUILD_SYSTEM)/config_sanitizers.mk
ifneq ($(LOCAL_NO_LIBCOMPILER_RT),true)
# Add in libcompiler_rt for all regular device builds
ifeq (,$(WITHOUT_LIBCOMPILER_RT))
my_static_libraries += $(COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES)
endif
endif
# Statically link libwinpthread when cross compiling win32.
ifeq ($($(my_prefix)OS),windows)
my_static_libraries += libwinpthread