corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1965538 - Fix configure Android bootstrapping on arm64 macOS r=firefox-build-system-reviewers,nalexander

Browse Source 
We were using `os_arch = platform.machine()` with the entry points for
`./mach bootstrap` and `host.cpu` in configure. They were not equivalent,
so now both use `os_arch = platform.machine()`, since getting `host` in
bootstrap seems tricky.

Differential Revision: https://phabricator.services.mozilla.com/D248642
This commit is contained in:
Alex Hochheiden
2025-05-09 18:29:28 +00:00
committed by ahochheiden@mozilla.com
parent ba8fc23230
commit f7035962d0
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
build/moz.configure/android-sdk.configure
View File

@@ -29,13 +29,18 @@ option(
)
@depends(host)
@dependable
@imports(_from="platform", _import="machine")
@imports(_from="mozboot.android", _import="get_os_name_for_android")
@imports(_from="mozboot.android", _import="get_os_tag_for_android")
def android_os_info(host):
def android_os_info():
os_name = get_os_name_for_android()
os_tag = get_os_tag_for_android(os_name)
os_arch = host.cpu
os_arch = machine()
if os_arch.lower() == "amd64":
# On Windows, x86_64 is reported as AMD64, but we use x86_64
# everywhere else, so let's normalize it.
os_arch = "x86_64"
if os_name == "windows" and os_arch.startswith("arm"):
die(

6
python/mozboot/mozboot/mozillabuild.py
View File

@@ -163,9 +163,9 @@ class MozillaBuildBootstrapper(BaseBootstrapper):
def _os_arch(self):
os_arch = platform.machine()
if os_arch == "AMD64":
# On Windows, x86_64 is reported as AMD64 but we use x86_64
# everywhere else, so let's normalized it here.
if os_arch.lower() == "amd64":
# On Windows, x86_64 is reported as AMD64, but we use x86_64
# everywhere else, so let's normalize it.
return "x86_64"
return os_arch