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

Bug 1416059 - Emit ASFLAGS and YASM_ASFLAGS from configure as lists. r=mshal

Browse Source 
MozReview-Commit-ID: LBWpzQ9mISI

--HG--
extra : rebase_source : f4074f4bdb0acddceeb57d9806c9a7f63a579280
This commit is contained in:
Chris Manchester 2017-11-13 14:13:11 -08:00
parent a944344724
commit 4dca13b1ae
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build/moz.configure/toolchain.configure
View File

@ -81,20 +81,20 @@ add_old_configure_assignment('_YASM_MINOR_VERSION',
def yasm_asflags(yasm, target):
if yasm:
asflags = {
('OSX', 'x86'): '-f macho32',
('OSX', 'x86_64'): '-f macho64',
('WINNT', 'x86'): '-f win32',
('WINNT', 'x86_64'): '-f x64',
('OSX', 'x86'): ['-f', 'macho32'],
('OSX', 'x86_64'): ['-f', 'macho64'],
('WINNT', 'x86'): ['-f', 'win32'],
('WINNT', 'x86_64'): ['-f', 'x64'],
}.get((target.os, target.cpu), None)
if asflags is None:
# We're assuming every x86 platform we support that's
# not Windows or Mac is ELF.
if target.cpu == 'x86':
asflags = '-f elf32'
asflags = ['-f', 'elf32']
elif target.cpu == 'x86_64':
asflags = '-f elf64'
asflags = ['-f', 'elf64']
if asflags:
asflags += ' -rnasm -pnasm'
asflags += ['-rnasm', '-pnasm']
return asflags

2
js/src/old-configure.in
View File

@ -1952,7 +1952,7 @@ AC_SUBST(AR)
AC_SUBST(AR_FLAGS)
AC_SUBST(AR_EXTRACT)
AC_SUBST(AS)
AC_SUBST(ASFLAGS)
AC_SUBST_LIST(ASFLAGS)
AC_SUBST(AS_DASH_C_FLAG)
AC_SUBST(RC)
AC_SUBST(RCFLAGS)

2
old-configure.in
View File

@ -4478,7 +4478,7 @@ AC_SUBST(AR)
AC_SUBST(AR_FLAGS)
AC_SUBST(AR_EXTRACT)
AC_SUBST(AS)
AC_SUBST(ASFLAGS)
AC_SUBST_LIST(ASFLAGS)
AC_SUBST(AS_DASH_C_FLAG)
AC_SUBST(RC)
AC_SUBST(RCFLAGS)