Merge "Set WifiHAL to only log debug by default." into nyc-dev
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