From b159ecc78ffa90a244a3430b9ad375dacfd05c2f Mon Sep 17 00:00:00 2001 From: Emma Harper Smith Date: Sun, 1 Jun 2025 14:43:48 -0700 Subject: [PATCH 1/4] Update path to WASI config.site --- master/custom/factories.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/master/custom/factories.py b/master/custom/factories.py index 9a8b528b..cc9eb424 100644 --- a/master/custom/factories.py +++ b/master/custom/factories.py @@ -881,7 +881,7 @@ class Wasm32WasiCrossBuild(UnixCrossBuild): "--without-pydebug", ] compile_environ = { - "CONFIG_SITE": "../../Tools/wasm/config.site-wasm32-wasi", + "CONFIG_SITE": "../../Tools/wasm/wasi/config.site-wasm32-wasi", } host = "wasm32-unknown-wasi" host_configure_cmd = ["../../Tools/wasm/wasi-env", "../../configure"] From e6de5a5f030fc2f8f1c74ee32f5417df07ea2407 Mon Sep 17 00:00:00 2001 From: Emma Harper Smith Date: Mon, 2 Jun 2025 09:29:41 -0700 Subject: [PATCH 2/4] Try templating in the config path --- master/custom/factories.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/master/custom/factories.py b/master/custom/factories.py index cc9eb424..f6f20953 100644 --- a/master/custom/factories.py +++ b/master/custom/factories.py @@ -887,6 +887,16 @@ class Wasm32WasiCrossBuild(UnixCrossBuild): host_configure_cmd = ["../../Tools/wasm/wasi-env", "../../configure"] def setup(self, parallel, branch, test_with_PTY=False, **kwargs): + self.addStep( + SetPropertyFromCommand( + name="Find config.site-wasm32-wasi", + description="Search Tools/wasm for config.site-wasm32-wasi", + command="find Tools/wasm -name config.site-wasm32-wasi", + property="config_site", + warnOnFailure=True, + ) + ) + self.host_configure_cmd.append(util.Interpolate("CONFIG_SITE=%(prop:config_site)")) self.addStep( ShellCommand( name="Touch srcdir Modules/Setup.local", From deeab10a8c54267e94d37a33c9c40b8fc6b88ab5 Mon Sep 17 00:00:00 2001 From: Emma Harper Smith Date: Tue, 3 Jun 2025 20:27:43 -0700 Subject: [PATCH 3/4] Interpolate value into builder --- master/custom/factories.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/master/custom/factories.py b/master/custom/factories.py index f6f20953..bdf99068 100644 --- a/master/custom/factories.py +++ b/master/custom/factories.py @@ -896,7 +896,7 @@ def setup(self, parallel, branch, test_with_PTY=False, **kwargs): warnOnFailure=True, ) ) - self.host_configure_cmd.append(util.Interpolate("CONFIG_SITE=%(prop:config_site)")) + self.host_configure_cmd.append(util.Interpolate("CONFIG_SITE=%(prop:config_site)s")) self.addStep( ShellCommand( name="Touch srcdir Modules/Setup.local", From f8f8f73a9250b146bbcdfd8de24118c6be09a1ab Mon Sep 17 00:00:00 2001 From: Emma Harper Smith Date: Wed, 4 Jun 2025 10:44:39 -0700 Subject: [PATCH 4/4] Remove CONFIG_SITE environment variable default --- master/custom/factories.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/master/custom/factories.py b/master/custom/factories.py index bdf99068..a45f23b1 100644 --- a/master/custom/factories.py +++ b/master/custom/factories.py @@ -880,9 +880,6 @@ class Wasm32WasiCrossBuild(UnixCrossBuild): # debug builds exhaust the limited call stack on WASI "--without-pydebug", ] - compile_environ = { - "CONFIG_SITE": "../../Tools/wasm/wasi/config.site-wasm32-wasi", - } host = "wasm32-unknown-wasi" host_configure_cmd = ["../../Tools/wasm/wasi-env", "../../configure"]