diff --git a/xbps-src/helpers/gnu-makefile.sh b/xbps-src/helpers/gnu-makefile.sh index 94c53658670..cc3d71c72e4 100644 --- a/xbps-src/helpers/gnu-makefile.sh +++ b/xbps-src/helpers/gnu-makefile.sh @@ -5,9 +5,6 @@ do_build() { if [ -z "$make_cmd" ]; then make_cmd=make fi - if [ -n "$XBPS_MAKEJOBS" -a -z "$disable_parallel_build" ]; then - makejobs="-j$XBPS_MAKEJOBS" - fi ${make_cmd} ${makejobs} ${make_build_args} ${make_build_target} } diff --git a/xbps-src/shutils/build_funcs.sh b/xbps-src/shutils/build_funcs.sh index 0390d6c7212..97680e33de0 100644 --- a/xbps-src/shutils/build_funcs.sh +++ b/xbps-src/shutils/build_funcs.sh @@ -43,6 +43,10 @@ build_src_phase() cd $build_wrksrc || return 1 fi + if [ -n "$XBPS_MAKEJOBS" -a -z "$disable_parallel_build" ]; then + makejobs="-j$XBPS_MAKEJOBS" + fi + # Run pre_build func. if [ ! -f $XBPS_PRE_BUILD_DONE ]; then run_func pre_build diff --git a/xbps-src/shutils/tmpl_funcs.sh.in b/xbps-src/shutils/tmpl_funcs.sh.in index fc495b953df..7be45e8b489 100644 --- a/xbps-src/shutils/tmpl_funcs.sh.in +++ b/xbps-src/shutils/tmpl_funcs.sh.in @@ -104,7 +104,7 @@ reset_tmpl_vars() ignore_vdeps_dir noverifyrdeps conflicts dkms_modules \ gconf_entries gconf_schemas stow_copy stow_copy_files \ pycompile_dirs pycompile_module systemd_services \ - homepage license kernel_hooks_version \ + homepage license kernel_hooks_version makejobs \ SUBPKG XBPS_EXTRACT_DONE XBPS_CONFIGURE_DONE \ XBPS_BUILD_DONE XBPS_INSTALL_DONE FILESDIR DESTDIR \ SRCPKGDESTDIR PATCHESDIR CFLAGS CXXFLAGS CPPFLAGS \