From f4511161d505681f4c5d4ff356fe61f4b78e7cf6 Mon Sep 17 00:00:00 2001 From: Shinichiro Hamaji Date: Fri, 26 Feb 2016 16:58:13 +0900 Subject: [PATCH] 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 Change-Id: I3de1bf4cd6f2a65ee9322e8504459621871612fc --- core/ninja.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/ninja.mk b/core/ninja.mk index 2878514e6..42f6833a0 100644 --- a/core/ninja.mk +++ b/core/ninja.mk @@ -159,7 +159,8 @@ KATI_CXX := $(CLANG_CXX) $(CLANG_HOST_GLOBAL_CFLAGS) $(CLANG_HOST_GLOBAL_CPPFLAG 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 -- 2.11.0