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

scons: fix signature for install_args (#34481)

Browse Source
This commit is contained in:
Massimiliano Culpo
2022-12-13 12:21:44 +01:00
committed by GitHub
parent f4fb20e27e
commit f9cfc2f57e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/spack/spack/build_systems/scons.py
View File

@@ -46,10 +46,10 @@ class SConsBuilder(BaseBuilder):
phases = ("build", "install") phases = ("build", "install")
#: Names associated with package methods in the old build-system format #: Names associated with package methods in the old build-system format
legacy_methods = ("install_args", "build_test") legacy_methods = ("build_test",)
#: Same as legacy_methods, but the signature is different #: Same as legacy_methods, but the signature is different
legacy_long_methods = ("build_args",) legacy_long_methods = ("build_args", "install_args")
#: Names associated with package attributes in the old build-system format #: Names associated with package attributes in the old build-system format
legacy_attributes = ("build_time_test_callbacks",) legacy_attributes = ("build_time_test_callbacks",)
@@ -66,13 +66,13 @@ def build(self, pkg, spec, prefix):
args = self.build_args(spec, prefix) args = self.build_args(spec, prefix)
inspect.getmodule(self.pkg).scons(*args) inspect.getmodule(self.pkg).scons(*args)
def install_args(self): def install_args(self, spec, prefix):
"""Arguments to pass to install.""" """Arguments to pass to install."""
return [] return []
def install(self, pkg, spec, prefix): def install(self, pkg, spec, prefix):
"""Install the package.""" """Install the package."""
args = self.install_args() args = self.install_args(spec, prefix)
inspect.getmodule(self.pkg).scons("install", *args) inspect.getmodule(self.pkg).scons("install", *args)