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

Fix compilation on different platform in the same time. 

If we modify the dependency's configure_env, we may change
the dictionary with value of the first platform. Then, when
we use it for the second platform, the previous values are used.

Do not modify the dep_conf_env dictionary and then we are good.
This commit is contained in:
Matthieu Gautier 2020-02-24 18:24:07 +01:00
parent 32e3b5b5c4
commit 94c98261c7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kiwixbuild/dependencies/base.py
View File

@ -315,12 +315,12 @@ class MakeBuilder(Builder):
dep_conf_env = self.configure_env dep_conf_env = self.configure_env
if not dep_conf_env: if not dep_conf_env:
return return
for k in list(dep_conf_env): for k, v in dep_conf_env.items():
if k.startswith('_format_'): if k.startswith('_format_'):
v = dep_conf_env.pop(k)
v = v.format(buildEnv=self.buildEnv, env=env) v = v.format(buildEnv=self.buildEnv, env=env)
dep_conf_env[k[8:]] = v env[k[8:]] = v
env.update(dep_conf_env) else:
env[k] = v
def _configure(self, context): def _configure(self, context):