Take two at fixing WASI config.site usage (#606)

emmatyping · web-flow · commit 7f1e4c5a592b · 2025-06-04T14:14:12.000-05:00
diff --git a/master/custom/factories.py b/master/custom/factories.py
@@ -893,7 +893,10 @@ def setup(self, parallel, branch, test_with_PTY=False, **kwargs):
                 warnOnFailure=True,
             )
         )
-        self.host_configure_cmd.append(util.Interpolate("CONFIG_SITE=%(prop:config_site)s"))
+        self.compile_environ = super().compile_environ.copy()
+        self.compile_environ.update(
+            CONFIG_SITE=util.Interpolate("../../%(prop:config_site)s")
+        )
         self.addStep(
             ShellCommand(
                 name="Touch srcdir Modules/Setup.local",

Original file line number	Diff line number	Diff line change
`@@ -893,7 +893,10 @@ def setup(self, parallel, branch, test_with_PTY=False, **kwargs):`
`893`	`893`	`warnOnFailure=True,`
`894`	`894`	`)`
`895`	`895`	`)`
`896`		`- self.host_configure_cmd.append(util.Interpolate("CONFIG_SITE=%(prop:config_site)s"))`
	`896`	`+ self.compile_environ = super().compile_environ.copy()`
	`897`	`+ self.compile_environ.update(`
	`898`	`+ CONFIG_SITE=util.Interpolate("../../%(prop:config_site)s")`
	`899`	`+ )`
`897`	`900`	`self.addStep(`
`898`	`901`	`ShellCommand(`
`899`	`902`	`name="Touch srcdir Modules/Setup.local",`