OSDN Git Service

makeparallel needs global CFLAGS now
authorColin Cross <ccross@android.com>
Wed, 30 Sep 2015 04:54:33 +0000 (21:54 -0700)
committerColin Cross <ccross@android.com>
Wed, 30 Sep 2015 05:11:40 +0000 (05:11 +0000)
After 3ad354951923f5c3593dd5f957ecd518126b41bc (Don't add CFLAGS to
CPPFLAGS), makeparallel now needs to explicitly include CFLAGS like
kati.

Change-Id: Ib50328da147f03647bb5b99f6d69948d644eece9

core/ninja.mk

index 9187f23..cb62e00 100644 (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)