wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 780561 - Fix the buildconfig python module handling of environment variables. r=ted

Browse Source
This commit is contained in:
Mike Hommey 2013-01-23 11:23:15 +01:00
parent 57ea225479
commit 71cd996deb
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build/buildconfig.py
View File

@ -16,12 +16,15 @@ while not os.path.exists(os.path.join(path, 'config.status')):
path = os.path.join(path, 'config.status')
config = imp.load_module('_buildconfig', open(path), path, ('', 'r', imp.PY_SOURCE))
for var in os.environ:
if var in config.substs:
config.substs[var] = os.environ[var]
# Copy values from the config.status namespace into this module namespace.
# This effectively imports topsrcdir, topobjdir, defines, substs, files,
# headers and non_global_defines
for var in config.__all__:
value = getattr(config, var)
if isinstance(value, list) and value and isinstance(value[0], tuple):
value = dict(value)
setattr(sys.modules[__name__], var, value)
for var in os.environ:
if var != 'SHELL' and var in substs:
substs[var] = os.environ[var]