mirror of
https://github.com/ZDoom/zdoom-macos-deps.git
synced 2024-11-25 05:11:49 +00:00
aedi: do not overwrite state environment variables
some adjustments like temporary directory are made before target configuration stage
This commit is contained in:
parent
37484936a6
commit
e410e3f7f4
1 changed files with 3 additions and 1 deletions
|
@ -91,6 +91,8 @@ class Builder(object):
|
||||||
state.jobs = arguments.jobs and arguments.jobs or \
|
state.jobs = arguments.jobs and arguments.jobs or \
|
||||||
subprocess.check_output(['sysctl', '-n', 'hw.ncpu']).decode('ascii').strip()
|
subprocess.check_output(['sysctl', '-n', 'hw.ncpu']).decode('ascii').strip()
|
||||||
|
|
||||||
|
self._environment = state.environment
|
||||||
|
|
||||||
def _populate_platforms(self, arguments):
|
def _populate_platforms(self, arguments):
|
||||||
state = self._state
|
state = self._state
|
||||||
|
|
||||||
|
@ -150,7 +152,7 @@ class Builder(object):
|
||||||
|
|
||||||
def _build(self, target: Target):
|
def _build(self, target: Target):
|
||||||
state = self._state
|
state = self._state
|
||||||
state.environment = os.environ.copy()
|
state.environment = self._environment.copy()
|
||||||
state.options = CommandLineOptions()
|
state.options = CommandLineOptions()
|
||||||
|
|
||||||
target.configure(state)
|
target.configure(state)
|
||||||
|
|
Loading…
Reference in a new issue