diff options
| author | Harmen Stoppels <harmenstoppels@gmail.com> | 2022-11-23 12:35:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-23 12:35:15 +0100 |
| commit | 55c77d659ec04f9bf431d6af5178a62b24991621 (patch) | |
| tree | b0f27cbe3e59a2dbe668728038663e318d56c4b0 /var | |
| parent | fe1c105161efa315c5f3e9450f667e2c65d42150 (diff) | |
| download | spack-55c77d659ec04f9bf431d6af5178a62b24991621.tar.gz spack-55c77d659ec04f9bf431d6af5178a62b24991621.tar.bz2 spack-55c77d659ec04f9bf431d6af5178a62b24991621.tar.xz spack-55c77d659ec04f9bf431d6af5178a62b24991621.zip | |
make/ninja: use the right number of jobs (#34057)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/gmake/package.py | 10 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/ninja-fortran/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/ninja/package.py | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/gmake/package.py b/var/spack/repos/builtin/packages/gmake/package.py index 7cccbacb01..000572516c 100644 --- a/var/spack/repos/builtin/packages/gmake/package.py +++ b/var/spack/repos/builtin/packages/gmake/package.py @@ -5,7 +5,7 @@ import re -from spack.build_environment import MakeExecutable +from spack.build_environment import MakeExecutable, determine_number_of_jobs from spack.package import * @@ -89,5 +89,9 @@ class Gmake(AutotoolsPackage, GNUMirrorPackage): symlink("make", "gmake") def setup_dependent_package(self, module, dspec): - module.make = MakeExecutable(self.spec.prefix.bin.make, make_jobs) - module.gmake = MakeExecutable(self.spec.prefix.bin.gmake, make_jobs) + module.make = MakeExecutable( + self.spec.prefix.bin.make, determine_number_of_jobs(parallel=dspec.package.parallel) + ) + module.gmake = MakeExecutable( + self.spec.prefix.bin.gmake, determine_number_of_jobs(parallel=dspec.package.parallel) + ) diff --git a/var/spack/repos/builtin/packages/ninja-fortran/package.py b/var/spack/repos/builtin/packages/ninja-fortran/package.py index 4709f51694..de759c7ac2 100644 --- a/var/spack/repos/builtin/packages/ninja-fortran/package.py +++ b/var/spack/repos/builtin/packages/ninja-fortran/package.py @@ -3,7 +3,9 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.build_environment import MakeExecutable, determine_number_of_jobs from spack.package import * +from spack.util.executable import which_string class NinjaFortran(Package): @@ -92,6 +94,6 @@ class NinjaFortran(Package): module.ninja = MakeExecutable( which_string(name, path=[self.spec.prefix.bin], required=True), - determine_number_of_jobs(parallel=self.parallel), + determine_number_of_jobs(parallel=dspec.package.parallel), supports_jobserver=True, # This fork supports jobserver ) diff --git a/var/spack/repos/builtin/packages/ninja/package.py b/var/spack/repos/builtin/packages/ninja/package.py index ba8e215f5d..b666a02a2d 100644 --- a/var/spack/repos/builtin/packages/ninja/package.py +++ b/var/spack/repos/builtin/packages/ninja/package.py @@ -79,6 +79,6 @@ class Ninja(Package): module.ninja = MakeExecutable( which_string(name, path=[self.spec.prefix.bin], required=True), - determine_number_of_jobs(parallel=self.parallel), + determine_number_of_jobs(parallel=dspec.package.parallel), supports_jobserver=self.spec.version == ver("kitware"), ) |