Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a73d4297 authored by Shinichiro Hamaji's avatar Shinichiro Hamaji Committed by Colin Cross
Browse files

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 f4511161)
parent c031c758

core/ninja.mk

+2 −1
Original line number Diff line number Diff line
@@ -160,7 +160,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