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

scons: fix Scons builder after multi build-system refactoring (#33753)

Browse Source
This commit is contained in:
Massimiliano Culpo 2022-11-08 16:03:15 +01:00 committed by GitHub
parent a079722b1c
commit 89976af732
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,8 +21,6 @@ class SConsPackage(spack.package_base.PackageBase):
#: build-system class we are using #: build-system class we are using
build_system_class = "SConsPackage" 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 attribute used to deserialize and install old specs
legacy_buildsystem = "scons" legacy_buildsystem = "scons"
@ -48,18 +46,24 @@ 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 = ("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 #: Names associated with package attributes in the old build-system format
legacy_attributes = () legacy_attributes = ("build_time_test_callbacks",)
def build_args(self): #: Callback names for build-time test
build_time_test_callbacks = ["build_test"]
def build_args(self, spec, prefix):
"""Arguments to pass to build.""" """Arguments to pass to build."""
return [] return []
def build(self, pkg, spec, prefix): def build(self, pkg, spec, prefix):
"""Build the package.""" """Build the package."""
args = self.build_args() 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):