summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMassimiliano Culpo <massimiliano.culpo@gmail.com>2022-11-08 16:03:15 +0100
committerGitHub <noreply@github.com>2022-11-08 16:03:15 +0100
commit89976af732a3055dbc6b2bfe3fae057e58e1293f (patch)
tree2e51d12564e0dda69253fd358944b7d1d5229db2 /lib
parenta079722b1cc95c1b857f14d549c5ab8157cbb3b9 (diff)
downloadspack-89976af732a3055dbc6b2bfe3fae057e58e1293f.tar.gz
spack-89976af732a3055dbc6b2bfe3fae057e58e1293f.tar.bz2
spack-89976af732a3055dbc6b2bfe3fae057e58e1293f.tar.xz
spack-89976af732a3055dbc6b2bfe3fae057e58e1293f.zip
scons: fix Scons builder after multi build-system refactoring (#33753)
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/build_systems/scons.py16
1 files changed, 10 insertions, 6 deletions
diff --git a/lib/spack/spack/build_systems/scons.py b/lib/spack/spack/build_systems/scons.py
index f1ae955917..2b1c36316e 100644
--- a/lib/spack/spack/build_systems/scons.py
+++ b/lib/spack/spack/build_systems/scons.py
@@ -21,8 +21,6 @@ class SConsPackage(spack.package_base.PackageBase):
#: build-system class we are using
build_system_class = "SConsPackage"
- #: Callback names for build-time test
- build_time_test_callbacks = ["build_test"]
#: Legacy buildsystem attribute used to deserialize and install old specs
legacy_buildsystem = "scons"
@@ -48,18 +46,24 @@ class SConsBuilder(BaseBuilder):
phases = ("build", "install")
#: Names associated with package methods in the old build-system format
- legacy_methods = ("build_args", "install_args", "build_test")
+ legacy_methods = ("install_args", "build_test")
+
+ #: Same as legacy_methods, but the signature is different
+ legacy_long_methods = ("build_args",)
#: Names associated with package attributes in the old build-system format
- legacy_attributes = ()
+ legacy_attributes = ("build_time_test_callbacks",)
+
+ #: Callback names for build-time test
+ build_time_test_callbacks = ["build_test"]
- def build_args(self):
+ def build_args(self, spec, prefix):
"""Arguments to pass to build."""
return []
def build(self, pkg, spec, prefix):
"""Build the package."""
- args = self.build_args()
+ args = self.build_args(spec, prefix)
inspect.getmodule(self.pkg).scons(*args)
def install_args(self):