commit a73d4297a044bd0b707ac6e70bceaaf610444a65
author Shinichiro Hamaji <hamaji@google.com> Fri Feb 26 16:58:13 2016 +0900
committer Colin Cross <ccross@android.com> Fri Mar 25 14:01:16 2016 -0700
tree c57f0d525936bc6f34ccc45e828e65b580bc0bf2
parent c031c758c63c83679cf55abb50ba9e4474d22814

Link everything in libpthread.a to ckati

With this workaround, we can delete a lot of unnecessary code
in ckati: https://github.com/google/kati/commit/8380fb8525adfb5

Bug: 26839129
Change-Id: I3de1bf4cd6f2a65ee9322e8504459621871612fc
(cherry picked from commit f4511161d505681f4c5d4ff356fe61f4b78e7cf6)

core/ninja.mk

diff --git a/core/ninja.mk b/core/ninja.mk
index d2e882d..8a4fd6d 100644
--- a/core/ninja.mk
+++ b/core/ninja.mk
@@ -160,7 +160,8 @@
 KATI_LD := $(CLANG_CXX) $(CLANG_HOST_GLOBAL_LDFLAGS)
 # Build static ckati. Unfortunately Mac OS X doesn't officially support static exectuables.
 ifeq ($(BUILD_OS),linux)
-KATI_LD += -static
+# We need everything in libpthread.a otherwise C++11's threading library will be disabled.
+KATI_LD += -static -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -ldl
 endif
 
 KATI_INTERMEDIATES_PATH := $(HOST_OUT_INTERMEDIATES)/EXECUTABLES/ckati_intermediates