diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-09-27 12:25:51 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-09-28 14:18:53 +0200 |
| commit | 77988977d74fc330c87808033247c71ca566bd2b (patch) | |
| tree | 23870f9d78fa463609f3ca3fa766c9e23ec4ede1 /scripts/lib/ptxd_make_world_common.sh | |
| parent | 48cb445dba5ed90ead184bf45bc7379911f8df5a (diff) | |
| download | ptxdist-77988977d74fc330c87808033247c71ca566bd2b.tar.gz ptxdist-77988977d74fc330c87808033247c71ca566bd2b.tar.xz | |
ptxd_make_world_init: fix parallel building with ninja without jobserver
Without jobserver, the correct PTXDIST_PARALLELMFLAGS_INTERN must be
preserved. Otherwise ninja will just use the default.
This is especially important when '-j1' or '-ji1' is used for debugging.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts/lib/ptxd_make_world_common.sh')
| -rw-r--r-- | scripts/lib/ptxd_make_world_common.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/lib/ptxd_make_world_common.sh b/scripts/lib/ptxd_make_world_common.sh index f2b1e22e2..fd38261d7 100644 --- a/scripts/lib/ptxd_make_world_common.sh +++ b/scripts/lib/ptxd_make_world_common.sh @@ -414,8 +414,10 @@ ptxd_make_world_init() { pkg_install_opt="-v ${pkg_install_opt}" fi # pass jobserver via MAKEFLAGS to ninja - pkg_env="${pkg_env} MAKEFLAGS='${PTXDIST_JOBSERVER_FLAGS}'" - PTXDIST_PARALLELMFLAGS_INTERN="" + if [ -n "${PTXDIST_JOBSERVER_FLAGS}" ]; then + pkg_env="${pkg_env} MAKEFLAGS='${PTXDIST_JOBSERVER_FLAGS}'" + PTXDIST_PARALLELMFLAGS_INTERN="" + fi fi # DESTDIR |