commit 06ba28c31e9bea93ae3e3994bfe766a0a4a0073e
author Alex Deymo <deymo@google.com> Wed Sep 30 18:08:20 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 30 18:08:20 2015 +0000
tree 47de4666598da17ced7adce7fe7fc012cab62fc4
parent 2ce7528a92d132523317dcb1252cf0c47459038b
parent 70067acd663df3fb0a747085f3d928c4b1777154

Merge "Pack the update_engine_config.txt when using the A/B OTA updater."

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)