am 2ce7528a: Merge "makeparallel needs global CFLAGS now"

* commit '2ce7528a92d132523317dcb1252cf0c47459038b':
  makeparallel needs global CFLAGS now
This commit is contained in:
Colin Cross 2015-09-30 05:17:20 +00:00 committed by Android Git Automerger
commit 9fc7d3d61e
1 changed files with 1 additions and 1 deletions

View File

@ -149,7 +149,7 @@ KATI_INTERMEDIATES_PATH := $(HOST_OUT_INTERMEDIATES)/EXECUTABLES/ckati_intermedi
KATI_BIN_PATH := $(HOST_OUT_EXECUTABLES)
include build/kati/Makefile.ckati
MAKEPARALLEL_CXX := $(CLANG_CXX) $(CLANG_HOST_GLOBAL_CPPFLAGS)
MAKEPARALLEL_CXX := $(CLANG_CXX) $(CLANG_HOST_GLOBAL_CFLAGS) $(CLANG_HOST_GLOBAL_CPPFLAGS)
MAKEPARALLEL_LD := $(CLANG_CXX) $(CLANG_HOST_GLOBAL_LDFLAGS)
# Build static makeparallel. Unfortunately Mac OS X doesn't officially support static exectuables.
ifeq ($(BUILD_OS),linux)