bug 1171642 - Disable some skia arm assembly for iOS. r=gw280

--HG--
extra : commitid : AvH15J44hkH
extra : rebase_source : ff5cef4f86b5b6667bde2f9c2978b9999bcacc13
This commit is contained in:
Ted Mielczarek 2015-06-15 11:47:43 -04:00
parent 767bd03bc6
commit 58ea8ea76e
2 changed files with 4 additions and 2 deletions

View File

@ -28,7 +28,8 @@ footer = """
# can we find a better way of dealing with asm sources?
# left out of UNIFIED_SOURCES for now; that's not C++ anyway, nothing else to unify it with
if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:
#XXX: doesn't build with Apple's assembler
if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC'] and CONFIG['OS_TARGET'] != 'Darwin':
SOURCES += [
'trunk/src/opts/memset.arm.S',
]

View File

@ -860,7 +860,8 @@ else:
# can we find a better way of dealing with asm sources?
# left out of UNIFIED_SOURCES for now; that's not C++ anyway, nothing else to unify it with
if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:
#XXX: doesn't build with Apple's assembler
if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC'] and CONFIG['OS_TARGET'] != 'Darwin':
SOURCES += [
'trunk/src/opts/memset.arm.S',
]