diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-05-25 08:42:39 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-05-25 20:59:29 +0200 |
| commit | b0b1317dea360e5a93389f6c17bdcc0c9f0a4dc0 (patch) | |
| tree | 2dd80c501bf52ab019561d6cf600437e3330438b /scripts/lib | |
| parent | e399eeb480607055ec22d4409ce4739a3e4ef101 (diff) | |
| download | ptxdist-b0b1317dea360e5a93389f6c17bdcc0c9f0a4dc0.tar.gz ptxdist-b0b1317dea360e5a93389f6c17bdcc0c9f0a4dc0.tar.xz | |
ninja: update jobserver patches from github issue
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts/lib')
| -rw-r--r-- | scripts/lib/ptxd_make_world_common.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/ptxd_make_world_common.sh b/scripts/lib/ptxd_make_world_common.sh index 90cac76c0..c8fc03282 100644 --- a/scripts/lib/ptxd_make_world_common.sh +++ b/scripts/lib/ptxd_make_world_common.sh @@ -333,9 +333,9 @@ ptxd_make_world_init() { pkg_make_opt="-v ${pkg_make_opt}" pkg_install_opt="-v ${pkg_install_opt}" fi - # both jobserver and argument limit parallelism so both are needed + # pass jobserver via MAKEFLAGS to ninja pkg_env="${pkg_env} MAKEFLAGS='${PTXDIST_JOBSERVER_FLAGS}'" - PTXDIST_PARALLELMFLAGS_INTERN="${PTXDIST_PARALLEL_FLAGS}" + PTXDIST_PARALLELMFLAGS_INTERN="" unset conf_opt_ptr ;; |