From 94c98261c7358fe8db4831776cf6396143a10cfc Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 24 Feb 2020 18:24:07 +0100 Subject: [PATCH] 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. --- kiwixbuild/dependencies/base.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kiwixbuild/dependencies/base.py b/kiwixbuild/dependencies/base.py index 270c9e3..09a5db8 100644 --- a/kiwixbuild/dependencies/base.py +++ b/kiwixbuild/dependencies/base.py @@ -315,12 +315,12 @@ class MakeBuilder(Builder): dep_conf_env = self.configure_env if not dep_conf_env: return - for k in list(dep_conf_env): + for k, v in dep_conf_env.items(): if k.startswith('_format_'): - v = dep_conf_env.pop(k) v = v.format(buildEnv=self.buildEnv, env=env) - dep_conf_env[k[8:]] = v - env.update(dep_conf_env) + env[k[8:]] = v + else: + env[k] = v def _configure(self, context):