зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1416059 - Emit ASFLAGS and YASM_ASFLAGS from configure as lists. r=mshal
MozReview-Commit-ID: LBWpzQ9mISI --HG-- extra : rebase_source : 4c722e68db4b6858aabbbecac834ea8772e0e06a
This commit is contained in:
Родитель
449023b47c
Коммит
72c380c671
|
@ -81,20 +81,20 @@ add_old_configure_assignment('_YASM_MINOR_VERSION',
|
||||||
def yasm_asflags(yasm, target):
|
def yasm_asflags(yasm, target):
|
||||||
if yasm:
|
if yasm:
|
||||||
asflags = {
|
asflags = {
|
||||||
('OSX', 'x86'): '-f macho32',
|
('OSX', 'x86'): ['-f', 'macho32'],
|
||||||
('OSX', 'x86_64'): '-f macho64',
|
('OSX', 'x86_64'): ['-f', 'macho64'],
|
||||||
('WINNT', 'x86'): '-f win32',
|
('WINNT', 'x86'): ['-f', 'win32'],
|
||||||
('WINNT', 'x86_64'): '-f x64',
|
('WINNT', 'x86_64'): ['-f', 'x64'],
|
||||||
}.get((target.os, target.cpu), None)
|
}.get((target.os, target.cpu), None)
|
||||||
if asflags is None:
|
if asflags is None:
|
||||||
# We're assuming every x86 platform we support that's
|
# We're assuming every x86 platform we support that's
|
||||||
# not Windows or Mac is ELF.
|
# not Windows or Mac is ELF.
|
||||||
if target.cpu == 'x86':
|
if target.cpu == 'x86':
|
||||||
asflags = '-f elf32'
|
asflags = ['-f', 'elf32']
|
||||||
elif target.cpu == 'x86_64':
|
elif target.cpu == 'x86_64':
|
||||||
asflags = '-f elf64'
|
asflags = ['-f', 'elf64']
|
||||||
if asflags:
|
if asflags:
|
||||||
asflags += ' -rnasm -pnasm'
|
asflags += ['-rnasm', '-pnasm']
|
||||||
return asflags
|
return asflags
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1952,7 +1952,7 @@ AC_SUBST(AR)
|
||||||
AC_SUBST(AR_FLAGS)
|
AC_SUBST(AR_FLAGS)
|
||||||
AC_SUBST(AR_EXTRACT)
|
AC_SUBST(AR_EXTRACT)
|
||||||
AC_SUBST(AS)
|
AC_SUBST(AS)
|
||||||
AC_SUBST(ASFLAGS)
|
AC_SUBST_LIST(ASFLAGS)
|
||||||
AC_SUBST(AS_DASH_C_FLAG)
|
AC_SUBST(AS_DASH_C_FLAG)
|
||||||
AC_SUBST(RC)
|
AC_SUBST(RC)
|
||||||
AC_SUBST(RCFLAGS)
|
AC_SUBST(RCFLAGS)
|
||||||
|
|
|
@ -4478,7 +4478,7 @@ AC_SUBST(AR)
|
||||||
AC_SUBST(AR_FLAGS)
|
AC_SUBST(AR_FLAGS)
|
||||||
AC_SUBST(AR_EXTRACT)
|
AC_SUBST(AR_EXTRACT)
|
||||||
AC_SUBST(AS)
|
AC_SUBST(AS)
|
||||||
AC_SUBST(ASFLAGS)
|
AC_SUBST_LIST(ASFLAGS)
|
||||||
AC_SUBST(AS_DASH_C_FLAG)
|
AC_SUBST(AS_DASH_C_FLAG)
|
||||||
AC_SUBST(RC)
|
AC_SUBST(RC)
|
||||||
AC_SUBST(RCFLAGS)
|
AC_SUBST(RCFLAGS)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче