diff --git a/lib/spack/spack/build_systems/cargo.py b/lib/spack/spack/build_systems/cargo.py index 8a254c3c5c4..b94d1e87b25 100644 --- a/lib/spack/spack/build_systems/cargo.py +++ b/lib/spack/spack/build_systems/cargo.py @@ -70,10 +70,16 @@ def build_directory(self): """Return the directory containing the main Cargo.toml.""" return self.pkg.stage.source_path + @property + def std_build_args(self): + """Standard arguments for ``cargo build`` provided as a property for + convenience of package writers.""" + return ["-j", str(self.pkg.module.make_jobs)] + @property def build_args(self): """Arguments for ``cargo build``.""" - return ["-j", str(self.pkg.module.make_jobs)] + return [] @property def check_args(self): @@ -88,7 +94,9 @@ def build( ) -> None: """Runs ``cargo install`` in the source directory""" with fs.working_dir(self.build_directory): - pkg.module.cargo("install", "--root", "out", "--path", ".", *self.build_args) + pkg.module.cargo( + "install", "--root", "out", "--path", ".", *self.std_build_args, *self.build_args + ) def install( self, pkg: CargoPackage, spec: spack.spec.Spec, prefix: spack.util.prefix.Prefix diff --git a/var/spack/repos/builtin/packages/jujutsu/package.py b/var/spack/repos/builtin/packages/jujutsu/package.py index adc4ef052ec..9fc6206adc2 100644 --- a/var/spack/repos/builtin/packages/jujutsu/package.py +++ b/var/spack/repos/builtin/packages/jujutsu/package.py @@ -32,4 +32,4 @@ def build_directory(self): @property def build_args(self): - return super().build_args + ["--bin", "jj", "jj-cli"] + return ["--bin", "jj", "jj-cli"]