Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 05:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1443471 - Support mingw clang in skia moz.build r=glandium

Browse Source 
MozReview-Commit-ID: 4H8bkHyczGM

--HG--
extra : rebase_source : e7764c43ee18230ef7603ac9c8e638d5bb18408f
This commit is contained in:
Jacek Caban 2018-06-25 21:22:02 +02:00
parent 52efb2adb3
commit 5c830a87fd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/skia/generate_mozbuild.py
View File

@ -68,7 +68,7 @@ LOCAL_INCLUDES += [
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
if CONFIG['CC_TYPE'] == 'gcc':
if CONFIG['CC_TYPE'] in ('gcc', 'clang'):
DEFINES['SK_JUMPER_USE_ASSEMBLY'] = 0
elif CONFIG['CPU_ARCH'] == 'x86':
SOURCES['skia/src/jumper/SkJumper_generated_win.S'].flags += ['-safeseh']
@ -456,7 +456,7 @@ def write_mozbuild(sources):
write_sources(f, sources['linux'], 4)
f.write("if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':\n")
f.write(" if CONFIG['CC_TYPE'] != 'gcc':\n")
f.write(" if CONFIG['CC_TYPE'] not in ('gcc', 'clang'):\n")
write_list(f, "SOURCES", sources['no-mingw'], 8)
# Windows-specific files don't get unification because of nasty headers.
# Luckily there are not many files in this.

4
gfx/skia/moz.build
View File

@ -626,7 +626,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
'skia/src/ports/SkFontHost_FreeType_common.cpp',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
if CONFIG['CC_TYPE'] != 'gcc':
if CONFIG['CC_TYPE'] not in ('gcc', 'clang'):
SOURCES += [
'skia/src/jumper/SkJumper_generated_win.S',
]
@ -742,7 +742,7 @@ LOCAL_INCLUDES += [
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
if CONFIG['CC_TYPE'] == 'gcc':
if CONFIG['CC_TYPE'] in ('gcc', 'clang'):
DEFINES['SK_JUMPER_USE_ASSEMBLY'] = 0
elif CONFIG['CPU_ARCH'] == 'x86':
SOURCES['skia/src/jumper/SkJumper_generated_win.S'].flags += ['-safeseh']