From 7d742f807ffdf075288fd3698cb4e21742657baa Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 19 Feb 2020 16:33:18 +0100 Subject: [PATCH] Fix setting of environment using env from dependency. If `self.configure_env` is a (computed) property, the previous code never format the value of the env. --- kiwixbuild/dependencies/base.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/kiwixbuild/dependencies/base.py b/kiwixbuild/dependencies/base.py index 1d86a73..cf69055 100644 --- a/kiwixbuild/dependencies/base.py +++ b/kiwixbuild/dependencies/base.py @@ -323,13 +323,14 @@ class MakeBuilder(Builder): if self.buildEnv.platformInfo.static: env['CFLAGS'] = env['CFLAGS'] + ' -fPIC' env['CXXFLAGS'] = env['CXXFLAGS'] + ' -fPIC' - if self.configure_env: - for k in list(self.configure_env): + dep_conf_env = self.configure_env + if dep_conf_env: + for k in list(dep_conf_env): if k.startswith('_format_'): - v = self.configure_env.pop(k) + v = dep_conf_env.pop(k) v = v.format(buildEnv=self.buildEnv, env=env) - self.configure_env[k[8:]] = v - env.update(self.configure_env) + dep_conf_env[k[8:]] = v + env.update(dep_conf_env) run_command(command, self.build_path, context, buildEnv=self.buildEnv, env=env) def _compile(self, context):