smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use msys64 shell (no space in path)

This commit is contained in:
Matthieu Gautier 2024-05-07 11:48:36 +02:00
parent 4b7fa59c4e
commit c089d2eb7d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kiwixbuild/configs/winbash.py
View File

@ -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