Bug 1315512 - Fix XZ library decompression on x86. r=esawin

MozReview-Commit-ID: 6mp3ABRi2gZ

--HG--
extra : rebase_source : 133125d83a2a9a79ec27d6f498c790eaf0ae9f11
This commit is contained in:
Nick Alexander 2016-11-07 20:04:24 -08:00
parent 8ef69ac7f8
commit 2e52fdc47f

View File

@ -18,12 +18,14 @@ UNIFIED_SOURCES += [
ALLOW_COMPILER_WARNINGS = True
if CONFIG['TARGET_CPU'] == 'arm':
if CONFIG['TARGET_CPU'].startswith('arm'):
# Accept arm, armv7, etc.
if CONFIG['MOZ_THUMB2']:
DEFINES['XZ_DEC_ARMTHUMB'] = 1
else:
DEFINES['XZ_DEC_ARM'] = 1
elif CONFIG['TARGET_CPU'] == 'x86':
elif '86' in CONFIG['TARGET_CPU']:
# Accept x86, x86_64, i386, i686, etc.
DEFINES['XZ_DEC_X86'] = 1
DEFINES['XZ_USE_CRC64'] = 1