From 0085c0b7db9924fa1761f040d7915e3ffe7f9c56 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 22 Apr 2024 16:42:58 +0200 Subject: [PATCH] Run configure using bash script --- kiwixbuild/buildenv.py | 2 +- kiwixbuild/configs/native.py | 5 +++++ kiwixbuild/configs/wasm.py | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/kiwixbuild/buildenv.py b/kiwixbuild/buildenv.py index 0c10157..d75d610 100644 --- a/kiwixbuild/buildenv.py +++ b/kiwixbuild/buildenv.py @@ -166,7 +166,7 @@ class BuildEnv: @property def configure_wrapper(self): try: - yield self.configInfo.configure_wrapper + yield from self.configInfo.configure_wrapper except AttributeError: pass diff --git a/kiwixbuild/configs/native.py b/kiwixbuild/configs/native.py index e6e391b..bbd4103 100644 --- a/kiwixbuild/configs/native.py +++ b/kiwixbuild/configs/native.py @@ -25,6 +25,11 @@ class NativeConfigInfo(ConfigInfo): return f"{platform.machine()}-apple-darwin" return sysconfig.get_platform() + @property + def configure_wrapper(self): + if neutralEnv("distname") == "Windows": + yield "C:\\Program Files\\Git\\bin\\bash.exe" + class NativeDyn(NativeConfigInfo): name = "native_dyn" diff --git a/kiwixbuild/configs/wasm.py b/kiwixbuild/configs/wasm.py index 1759eb3..e986952 100644 --- a/kiwixbuild/configs/wasm.py +++ b/kiwixbuild/configs/wasm.py @@ -68,7 +68,7 @@ class WasmConfigInfo(ConfigInfo): @property def configure_wrapper(self): - return "emconfigure" + yield "emconfigure" @property def make_wrapper(self):