Make the neutralEnv global.

No need to pass the neutralEnv from instance to instance.
This commit is contained in:
Matthieu Gautier
2018-05-28 11:16:47 +02:00
parent f44042f910
commit 816e06a512
11 changed files with 57 additions and 52 deletions

View File

@ -10,8 +10,7 @@ class Builder:
def __init__(self, options):
self.options = options
self.targets = OrderedDict()
self.neutralEnv = PlatformNeutralEnv(options)
self.buildEnv = BuildEnv(options, self.neutralEnv, self.targets)
self.buildEnv = BuildEnv(options, self.targets)
_targets = {}
targetDef = options.targets
@ -31,7 +30,7 @@ class Builder:
if targetName in targets:
return
targetClass = Dependency.all_deps[targetName]
target = targetClass(self.neutralEnv, self.buildEnv)
target = targetClass(self.buildEnv)
targets[targetName] = target
for dep in target.dependencies:
self.add_targets(dep, targets)