Commit ca655b6
build: fix -j propagation to ninja
The expression containing MAKEFLAGS must be evaluated in a deferred
context for the propagation to work in GNU make. Otherwise, regardless
of the -j value passed to make, ninja will spawn a potentially greater
number of parallel compilation tasks, which can quickly exhaust all
available memory.
PR-URL: #53088
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent 6b1731c commit ca655b6
1 file changed
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -146,7 +146,8 @@ endif | |||
| 146 | 146 | ifdef JOBS | |
| 147 | 147 | NINJA_ARGS := $(NINJA_ARGS) -j$(JOBS) | |
| 148 | 148 | else | |
| 149 | - NINJA_ARGS := $(NINJA_ARGS) $(filter -j%,$(MAKEFLAGS)) | ||
| 149 | + IMMEDIATE_NINJA_ARGS := $(NINJA_ARGS) | ||
| 150 | + NINJA_ARGS = $(IMMEDIATE_NINJA_ARGS) $(filter -j%,$(MAKEFLAGS)) | ||
| 150 | 151 | endif | |
| 151 | 152 | $(NODE_EXE): config.gypi out/Release/build.ninja | |
| 152 | 153 | $(NINJA) -C out/Release $(NINJA_ARGS) | |
0 commit comments