commit 8f26a45bb6b2fa75c7a1f969690cb7c6e9d4ddff
author Colin Cross <ccross@android.com> Tue Sep 29 21:54:33 2015 -0700
committer Colin Cross <ccross@android.com> Wed Sep 30 05:11:40 2015 +0000
tree aed7b21b8f3ac4ca5881d66f561783053431f610
parent 8f9f01bbc3968be4e99fbd9bb2ba38314875e8dc

makeparallel needs global CFLAGS now

After 3ad354951923f5c3593dd5f957ecd518126b41bc (Don't add CFLAGS to
CPPFLAGS), makeparallel now needs to explicitly include CFLAGS like
kati.

Change-Id: Ib50328da147f03647bb5b99f6d69948d644eece9

core/ninja.mk

diff --git a/core/ninja.mk b/core/ninja.mk
index 9187f23..cb62e00 100644
--- a/core/ninja.mk
+++ b/core/ninja.mk
@@ -149,7 +149,7 @@
 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)