zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cargo: avoid need to use super().build_args with std_build_args (#49071)

Browse Source 
* cargo: avoid need to use super().build_args with std_build_args

* cargo: fix style

* jujutsu: avoid need for super().build_args
This commit is contained in:
Wouter Deconinck 2025-02-19 11:01:56 -06:00 committed by GitHub
parent 75c3d0a053
commit f9e4d3898a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/spack/spack/build_systems/cargo.py
View File

@ -70,10 +70,16 @@ def build_directory(self):
"""Return the directory containing the main Cargo.toml.""" """Return the directory containing the main Cargo.toml."""
return self.pkg.stage.source_path 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 @property
def build_args(self): def build_args(self):
"""Arguments for ``cargo build``.""" """Arguments for ``cargo build``."""
return ["-j", str(self.pkg.module.make_jobs)] return []
@property @property
def check_args(self): def check_args(self):
@ -88,7 +94,9 @@ def build(
) -> None: ) -> None:
"""Runs ``cargo install`` in the source directory""" """Runs ``cargo install`` in the source directory"""
with fs.working_dir(self.build_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( def install(
self, pkg: CargoPackage, spec: spack.spec.Spec, prefix: spack.util.prefix.Prefix self, pkg: CargoPackage, spec: spack.spec.Spec, prefix: spack.util.prefix.Prefix

2
var/spack/repos/builtin/packages/jujutsu/package.py
View File

@ -32,4 +32,4 @@ def build_directory(self):
@property @property
def build_args(self): def build_args(self):
return super().build_args + ["--bin", "jj", "jj-cli"] return ["--bin", "jj", "jj-cli"]