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:
parent
32e3b5b5c4
commit
94c98261c7
|
@ -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):
|
||||
|
|
Loading…
Reference in New Issue