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

Packages need to be install before we look to binaries installed by them. 

In setup_win32, we search where gcc compilers are installed. We need
to have them installed before.
This commit is contained in:
Matthieu Gautier 2017-02-07 13:16:40 +01:00
parent 6d18da1587
commit 5919e28a2f
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kiwix-build.py
View File

@ -254,6 +254,8 @@ class BuildEnv:
def setup_build_target(self, build_target): def setup_build_target(self, build_target):
self.build_target = build_target self.build_target = build_target
self.target_env = self._targets_env[self.build_target] self.target_env = self._targets_env[self.build_target]
def finalize_setup(self):
getattr(self, 'setup_{}'.format(self.build_target))() getattr(self, 'setup_{}'.format(self.build_target))()
def setup_native(self): def setup_native(self):
@ -1002,6 +1004,9 @@ class Builder:
try: try:
print("[INSTALL PACKAGES]") print("[INSTALL PACKAGES]")
self.buildEnv.install_packages() self.buildEnv.install_packages()
self.buildEnv.finalize_setup()
if self.nativeBuildEnv != self.buildEnv:
self.nativeBuildEnv.finalize_setup()
print("[PREPARE]") print("[PREPARE]")
self.prepare_sources() self.prepare_sources()
print("[BUILD]") print("[BUILD]")