mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Backed out changeset 9ad40457f58f (bug 936555) for checktest failures.
This commit is contained in:
parent
7d0addbab1
commit
2276ee1961
@ -8,7 +8,7 @@
|
||||
import os
|
||||
import re
|
||||
import json
|
||||
import mozbuild.mozconfig as mozconfig
|
||||
|
||||
|
||||
def build_dict(config, env=os.environ):
|
||||
"""
|
||||
@ -27,9 +27,10 @@ def build_dict(config, env=os.environ):
|
||||
d = {}
|
||||
d['topsrcdir'] = config.topsrcdir
|
||||
|
||||
the_mozconfig = mozconfig.MozconfigLoader(config.topsrcdir).find_mozconfig()
|
||||
if the_mozconfig:
|
||||
d['mozconfig'] = the_mozconfig
|
||||
if 'MOZCONFIG' in env:
|
||||
mozconfig = env["MOZCONFIG"]
|
||||
mozconfig = os.path.join(config.topsrcdir, mozconfig)
|
||||
d['mozconfig'] = os.path.normpath(mozconfig)
|
||||
|
||||
# os
|
||||
o = substs["OS_TARGET"]
|
||||
|
Loading…
Reference in New Issue
Block a user