Bug 1486056 - don't compile SkJumper_generated_win.S on aarch64 windows; r=lsalzman

Compiling a blob of x86 machine code is not going to end well.
This commit is contained in:
Nathan Froyd 2018-08-27 09:12:15 -04:00
Родитель ac6614c34b
Коммит 57b9c2ac11
2 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

@ -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'] not in ('gcc', 'clang'):\n")
f.write(" if CONFIG['CC_TYPE'] not in ('gcc', 'clang') and CONFIG['CPU_ARCH'] != 'aarch64':\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.

Просмотреть файл

@ -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'] not in ('gcc', 'clang'):
if CONFIG['CC_TYPE'] not in ('gcc', 'clang') and CONFIG['CPU_ARCH'] != 'aarch64':
SOURCES += [
'skia/src/jumper/SkJumper_generated_win.S',
]