aboutsummaryrefslogtreecommitdiff
path: root/main.cc
diff options
context:
space:
mode:
authorShinichiro Hamaji <shinichiro.hamaji@gmail.com>2015-09-04 10:06:30 +0900
committerShinichiro Hamaji <shinichiro.hamaji@gmail.com>2015-09-04 10:09:00 +0900
commitcdcd419f0b9af77d4217458b3fdcbe83d08170af (patch)
tree22d7c49bc507af710c1b79ec911cf8367da2c234 /main.cc
parent91d1249bbb793e649cfdf1aac224f358642b28d8 (diff)
[C++] Define MAKE=make -j cpus/2
So that sub-make works, although ninja won't be used. Also define KATI bootstrap variable to make it easier to determine if we are running make or kati.
Diffstat (limited to 'main.cc')
-rw-r--r--main.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/main.cc b/main.cc
index 734b22a..5373556 100644
--- a/main.cc
+++ b/main.cc
@@ -186,9 +186,9 @@ static void ReadBootstrapMakefile(const vector<Symbol>& targets,
"CXX?=g++\n"
#endif
"AR?=ar\n"
- "MAKE?=kati\n"
// Pretend to be GNU make 3.81, for compatibility.
"MAKE_VERSION?=3.81\n"
+ "KATI?=ckati\n"
// Overwrite $SHELL environment variable.
"SHELL=/bin/sh\n"
// TODO: Add more builtin vars.
@@ -202,7 +202,9 @@ static void ReadBootstrapMakefile(const vector<Symbol>& targets,
"\t$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<\n"
// TODO: Add more builtin rules.
);
- bootstrap += StringPrintf("MAKECMDGOALS:=%s\n",
+ bootstrap += StringPrintf("MAKE?=make -j%d\n",
+ g_num_jobs < 1 ? 1 : g_num_jobs / 2);
+ bootstrap += StringPrintf("MAKECMDGOALS?=%s\n",
JoinSymbols(targets, " ").c_str());
char cwd[PATH_MAX];