From c089d2eb7d2fb5f49e658ebafbb93bd530f6a666 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 7 May 2024 11:48:36 +0200 Subject: [PATCH] Use msys64 shell (no space in path) --- kiwixbuild/configs/winbash.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/kiwixbuild/configs/winbash.py b/kiwixbuild/configs/winbash.py index b228a9f..d25690e 100644 --- a/kiwixbuild/configs/winbash.py +++ b/kiwixbuild/configs/winbash.py @@ -20,11 +20,14 @@ class WinBashConfigInfo(ConfigInfo): @property def configure_wrapper(self): - yield "C:\\Program Files\\Git\\bin\\bash.exe" + yield "C:\\msys64\\usr\\bin\\bash.exe" + + # yield "C:\\Program Files\\Git\\bin\\bash.exe" @property def make_wrapper(self): - yield "C:\\Program Files\\Git\\bin\\bash.exe" + yield "C:\\msys64\\usr\\bin\\bash.exe" + # yield "C:\\Program Files\\Git\\bin\\bash.exe" yield "-c" @property @@ -42,10 +45,9 @@ class WinBashConfigInfo(ConfigInfo): def set_comp_flags(self, env): super().set_comp_flags(env) - env["PATH"] += ["C:\\Program Files\\Git\\bin"] env["CXXFLAGS"] = "-EHsc -MD " + env["CXXFLAGS"] def get_env(self): env = super().get_env() - env["MAKESHELL"] = "C:/'Program Files'/Git/bin/sh.exe" + env["PATH"] += ["C:\\msys64\\usr\\bin"] return env