Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1218042 - part 1 - pass an objdir into _build_db_line; r=mshal

Browse Source 
The only thing we need the obj for here is getting the objdir.  Future
patches will just have an objdir when calling this function, and not a
proper mozbuild object.  In light of these facts, let's change the
function to accept an objdir only, which will make those future patches
easier.
This commit is contained in:
Nathan Froyd 2015-10-26 11:50:27 -04:00
parent 65c73a3e0e
commit ca9570920f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python/mozbuild/mozbuild/compilation/database.py
View File

@ -42,14 +42,14 @@ class CompileDBBackend(CommonBackend):
# Note that unified sources are never used for host sources.
for f in obj.unified_source_mapping:
flags = self._get_dir_flags(obj.objdir)
self._build_db_line(obj, self.environment, f[0],
self._build_db_line(obj.objdir, self.environment, f[0],
obj.canonical_suffix, flags, False)
elif isinstance(obj, Sources) or isinstance(obj, HostSources) or \
isinstance(obj, GeneratedSources):
# For other sources, include each source file.
for f in obj.files:
flags = self._get_dir_flags(obj.objdir)
self._build_db_line(obj, self.environment, f,
self._build_db_line(obj.objdir, self.environment, f,
obj.canonical_suffix, flags,
isinstance(obj, HostSources))
@ -86,7 +86,7 @@ class CompileDBBackend(CommonBackend):
self._flags[directory] = build_vars
return self._flags[directory]
def _build_db_line(self, obj, cenv, filename, canonical_suffix, flags, ishost):
def _build_db_line(self, objdir, cenv, filename, canonical_suffix, flags, ishost):
# Distinguish between host and target files.
prefix = 'HOST_' if ishost else ''
if canonical_suffix == '.c':
@ -112,7 +112,7 @@ class CompileDBBackend(CommonBackend):
])
self._db.append({
'directory': obj.objdir,
'directory': objdir,
'command': cmd,
'file': filename
})