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 1245015 - Properly handle ObjC sources in the CompileDB backend. r=mshal

Browse Source
This commit is contained in:
Mike Hommey 2016-02-02 16:51:59 +09:00
parent 5ecc0370d4
commit c18e3ea405
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

@ -118,17 +118,17 @@ class CompileDBBackend(CommonBackend):
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':
if canonical_suffix in ('.c', '.m'):
compiler = cenv.substs[prefix + 'CC']
cflags = list(flags['COMPILE_CFLAGS'])
# Add the Objective-C flags if needed.
if filename.endswith('.m'):
if canonical_suffix == '.m':
cflags.extend(flags['COMPILE_CMFLAGS'])
elif canonical_suffix == '.cpp':
elif canonical_suffix in ('.cpp', '.mm'):
compiler = cenv.substs[prefix + 'CXX']
cflags = list(flags['COMPILE_CXXFLAGS'])
# Add the Objective-C++ flags if needed.
if filename.endswith('.mm'):
if canonical_suffix == '.mm':
cflags.extend(flags['COMPILE_CMMFLAGS'])
else:
return