Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1907180 - Remove obsolete AC_CANONICAL_SYSTEM from old-configure r=glandium

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D216219
This commit is contained in:
serge-sans-paille 2024-08-29 07:42:33 +00:00
parent aaf3d303e2
commit 56b7a9d701
5 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -802,18 +802,8 @@ set_define(
"WORDS_BIGENDIAN", True, when=depends(target.endianness)(lambda e: e == "big") "WORDS_BIGENDIAN", True, when=depends(target.endianness)(lambda e: e == "big")
) )
set_config("host", host.sub_configure_alias)
# Autoconf needs these set set_config("target", target.sub_configure_alias)
@depends(host)
def host_for_sub_configure(host):
return "--host=%s" % host.sub_configure_alias
@depends(target)
def target_for_sub_configure(target):
return "--target=%s" % target.sub_configure_alias
# These variables are for compatibility with the current moz.builds and # These variables are for compatibility with the current moz.builds and

8
build/moz.configure/old.configure
View File

@ -89,9 +89,7 @@ def old_configure_options(*options):
def all_options(): def all_options():
return list(options) return list(options)
return depends( return depends(all_options, *options)
host_for_sub_configure, target_for_sub_configure, all_options, *options
)
@old_configure_options( @old_configure_options(
@ -101,7 +99,7 @@ def old_configure_options(*options):
"--x-includes", "--x-includes",
"--x-libraries", "--x-libraries",
) )
def prepare_configure_options(host, target, all_options, *options): def prepare_configure_options(all_options, *options):
# old-configure only supports the options listed in @old_configure_options # old-configure only supports the options listed in @old_configure_options
# so we don't need to pass it every single option we've been passed. Only # so we don't need to pass it every single option we've been passed. Only
# the ones that are not supported by python configure need to. # the ones that are not supported by python configure need to.
@ -109,7 +107,7 @@ def prepare_configure_options(host, target, all_options, *options):
value.format(name) value.format(name)
for name, value in zip(all_options, options) for name, value in zip(all_options, options)
if value.origin != "default" if value.origin != "default"
] + [host, target] ]
return namespace(options=options, all_options=all_options) return namespace(options=options, all_options=all_options)

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

@ -9,7 +9,6 @@ dnl ========================================================
AC_PREREQ(2.13) AC_PREREQ(2.13)
AC_INIT(js/src/jsapi.h) AC_INIT(js/src/jsapi.h)
AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf) AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
AC_CANONICAL_SYSTEM
dnl ======================================================== dnl ========================================================
dnl = dnl =

1
old-configure.in
View File

@ -9,7 +9,6 @@ dnl ========================================================
AC_PREREQ(2.13) AC_PREREQ(2.13)
AC_INIT(config/config.mk) AC_INIT(config/config.mk)
AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf) AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
AC_CANONICAL_SYSTEM
dnl ======================================================== dnl ========================================================
dnl = dnl =

8
toolkit/mozapps/installer/informulate.py
View File

@ -30,8 +30,8 @@ def main():
mozinfo.find_and_update_from_json() mozinfo.find_and_update_from_json()
important_substitutions = [ important_substitutions = [
"target_alias", "target",
"host_alias", "host",
"MOZ_UPDATE_CHANNEL", "MOZ_UPDATE_CHANNEL",
"MOZ_APP_VENDOR", "MOZ_APP_VENDOR",
"MOZ_APP_NAME", "MOZ_APP_NAME",
@ -81,8 +81,8 @@ def main():
"as": all_key_value_pairs["as"], "as": all_key_value_pairs["as"],
"cc": all_key_value_pairs["cc"], "cc": all_key_value_pairs["cc"],
"cxx": all_key_value_pairs["cxx"], "cxx": all_key_value_pairs["cxx"],
"host": s["host_alias"], "host": s["host"],
"target": s["target_alias"], "target": s["target"],
}, },
"source": { "source": {
"product": s["MOZ_APP_NAME"], "product": s["MOZ_APP_NAME"],