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

Use a CROSS_ENV per host and target, not only target. 

Depending of the host, we may have different cross_env.
This commit is contained in:
Matthieu Gautier 2017-02-06 17:30:47 +01:00
parent db5183f952
commit 2451c35d79
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kiwix-build.py
View File

@ -20,7 +20,7 @@ REMOTE_PREFIX = 'http://download.kiwix.org/dev/'
SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__)) SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
CROSS_ENV = { CROSS_ENV = {
'win32' : { 'fedora_win32' : {
'root_path' : '/usr/i686-w64-mingw32/sys-root/mingw', 'root_path' : '/usr/i686-w64-mingw32/sys-root/mingw',
'binaries' : { 'binaries' : {
'c' : 'i686-w64-mingw32-gcc', 'c' : 'i686-w64-mingw32-gcc',
@ -237,7 +237,18 @@ class BuildEnv:
return crossfile return crossfile
def setup_win32(self): def setup_win32(self):
self.cross_env = CROSS_ENV['win32'] cross_name = "{host}_{target}".format(
host = self.distname,
target = self.build_target)
try:
self.cross_env = CROSS_ENV[cross_name]
except KeyError:
sys.exit("ERROR : We don't know how to set env to compile"
" a {target} version on a {host} host.".format(
target = self.build_target,
host = self.distname
))
self.wrapper = self._gen_crossfile('bash_wrapper.sh') self.wrapper = self._gen_crossfile('bash_wrapper.sh')
current_permissions = stat.S_IMODE(os.lstat(self.wrapper).st_mode) current_permissions = stat.S_IMODE(os.lstat(self.wrapper).st_mode)
os.chmod(self.wrapper, current_permissions | stat.S_IXUSR) os.chmod(self.wrapper, current_permissions | stat.S_IXUSR)