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 1186259 - Record the path to GCC to avoid mismatched gcc/plugin versions, r=terrence

Browse Source
This commit is contained in:
Steve Fink 2015-07-23 16:35:08 -07:00
parent 99a717601e
commit 95444f349f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/devtools/rootAnalysis/analyze.py
View File

@ -18,7 +18,7 @@ import re
def env(config):
e = dict(os.environ)
e['PATH'] = '%s:%s' % (e['PATH'], config['sixgill_bin'])
e['PATH'] = ':'.join(p for p in (config.get('gcc_bin'), config.get('sixgill_bin'), e['PATH']) if p)
e['XDB'] = '%(sixgill_bin)s/xdb.so' % config
e['SOURCE'] = config['source']
e['ANALYZED_OBJDIR'] = config['objdir']

4
testing/mozharness/mozharness/mozilla/building/hazards.py
View File

@ -85,6 +85,7 @@ class HazardAnalysis(object):
'source': os.path.join(dirs['abs_work_dir'], 'source'),
'sixgill': os.path.join(dirs['abs_work_dir'], builder.config['sixgill']),
'sixgill_bin': os.path.join(dirs['abs_work_dir'], builder.config['sixgill_bin']),
'gcc_bin': os.path.join(dirs['abs_work_dir'], 'gcc'),
}
defaults = """
js = '%(js)s'
@ -93,7 +94,8 @@ objdir = '%(source_objdir)s'
source = '%(source)s'
sixgill = '%(sixgill)s'
sixgill_bin = '%(sixgill_bin)s'
jobs = 2
gcc_bin = '%(gcc_bin)s'
jobs = 4
""" % values
defaults_path = os.path.join(analysis_dir, 'defaults.py')