From a2f05880042d0e38eb2418a24668f87fc42f0f18 Mon Sep 17 00:00:00 2001 From: Tom Scogland Date: Fri, 26 Aug 2022 02:37:53 -0700 Subject: calculate make_jobs in ninja (#32384) This is in case ninja's setup_dependent_package is called before its module is initialized by build_environment --- var/spack/repos/builtin/packages/ninja/package.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ninja/package.py b/var/spack/repos/builtin/packages/ninja/package.py index 9ae951f0b3..5321d55041 100644 --- a/var/spack/repos/builtin/packages/ninja/package.py +++ b/var/spack/repos/builtin/packages/ninja/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import sys -from spack.build_environment import MakeExecutable +from spack.build_environment import MakeExecutable, determine_number_of_jobs from spack.package import * from spack.util.executable import which_string @@ -74,6 +74,8 @@ class Ninja(Package): def setup_dependent_package(self, module, dspec): name = "ninja" + module.ninja = MakeExecutable( - which_string(name, path=[self.spec.prefix.bin], required=True), module.make_jobs + which_string(name, path=[self.spec.prefix.bin], required=True), + determine_number_of_jobs(parallel=self.parallel), ) -- cgit v1.2.3-70-g09d2