Skip to content

Commit 9939a40

Browse files
committed
Fix DESTDIR passing for openssh
Set configure and make arguments in setup so they are alwasy set and make configure() only handle autoreconf. Fixes: CTSRD-CHERI#297 Suggested by: @jrtc27
1 parent 29653ad commit 9939a40

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

pycheribuild/projects/cross/openssh.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,12 @@ def __init__(self, config: CheriConfig):
4444
super().__init__(config)
4545
self.add_required_system_tool("autoreconf", default="autoconf")
4646

47-
def configure(self, **kwargs):
47+
def setup(self):
48+
super().setup()
4849
self.add_configure_env_arg("AR", self.target_info.ar)
4950
self.add_configure_env_arg("ac_cv_have_control_in_msghdr", "yes")
50-
self.run_cmd("autoreconf", str(self.source_dir), cwd=self.build_dir)
5151
self.make_args.set(DESTDIR=str(self.destdir))
52+
53+
def configure(self, **kwargs):
54+
self.run_cmd("autoreconf", str(self.source_dir), cwd=self.build_dir)
5255
super().configure(**kwargs)

0 commit comments

Comments
 (0)