Merge "Statically link libwinpthread into windows binaries." am: 61d68b6152 am: aa19e7a2bb

am: f1ed0fb048 Change-Id: Ia1cb660fb8fee069884d4c42ded3a9ec1b002684
2017-02-24 21:14:27 +00:00
parent 433e7e4d45 f1ed0fb048
commit 5794e3baac
3 changed files with 71 additions and 1 deletions
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -473,6 +473,11 @@ ifeq (,$(WITHOUT_LIBCOMPILER_RT))
 endif
 endif

+# Statically link libwinpthread when cross compiling win32.
+ifeq ($($(my_prefix)OS),windows)
+  my_static_libraries += libwinpthread
+endif
+
 ifneq ($(filter ../%,$(my_src_files)),)
 my_soong_problems += dotdot_srcs
 endif