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

Commit f00cf839 authored by Shinichiro Hamaji's avatar Shinichiro Hamaji Committed by android-build-merger
Browse files

Merge "Link everything in libpthread.a to ckati" am: a9b46477 am: 8f9b8ddf 

am: 31221555

* commit '31221555':
  Link everything in libpthread.a to ckati
parents 0df47710 31221555

core/ninja.mk

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