scons: fix signature for install_args
(#34481)
This commit is contained in:
parent
7055061635
commit
8d45404b5b
@ -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)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user