OSDN Git Service
(root)
/
android-x86
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8f9f01b
)
makeparallel needs global CFLAGS now
author
Colin Cross
<ccross@android.com>
Wed, 30 Sep 2015 04:54:33 +0000
(21:54 -0700)
committer
Colin 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
patch
|
blob
|
history
diff --git
a/core/ninja.mk
b/core/ninja.mk
index
9187f23
..
cb62e00
100644
(file)
--- a/
core/ninja.mk
+++ b/
core/ninja.mk
@@
-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_C
FLAGS) $(CLANG_HOST_GLOBAL_C
PPFLAGS)
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)