commit 479de8779ef74c0976f81cba00492aa17cfb6c36
author Ying Wang <wangying@android.com> Thu Aug 06 17:55:13 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 06 17:55:13 2015 +0000
tree c0d431f6ae4fd696e44ec3f9fadbf6acfdc6dd79
parent 422e972b0548a7f3d2b76e6a5ec9dd77c05283cb
parent a101f55893ecaa59666faa653a926ea49d57212a

am a101f558: am ecbc5b40: Merge "Build static ckati on Linux."

* commit 'a101f55893ecaa59666faa653a926ea49d57212a':
  Build static ckati on Linux.

core/ninja.mk

diff --git a/core/ninja.mk b/core/ninja.mk
index e68ae12..de133c5 100644
--- a/core/ninja.mk
+++ b/core/ninja.mk
@@ -42,6 +42,11 @@
 
 KATI_CXX := $(CLANG_CXX) $(CLANG_HOST_GLOBAL_CPPFLAGS)
 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
+endif
+
 KATI_INTERMEDIATES_PATH := $(HOST_OUT_INTERMEDIATES)/EXECUTABLES/ckati_intermediates
 KATI_BIN_PATH := $(HOST_OUT_EXECUTABLES)
 include build/kati/Makefile.ckati