Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bug 1656986 - special-case arm64 in detect_host_arch.py; r=jcj
This case comes up when attempting to build NSS on ARM64 Mac.  If we don't
do this, we wind up detecting arm64 as "arm", with predictably bad
consequences.

Differential Revision: https://phabricator.services.mozilla.com/D85786

--HG--
extra : moz-landing-system : lando
  • Loading branch information
froydnj committed Aug 3, 2020
1 parent 80417a9 commit 6ebd04c
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions coreconf/detect_host_arch.py
Expand Up @@ -15,6 +15,8 @@ def main():
host_arch = 'x64'
elif fnmatch.fnmatch(host_arch, 'i?86') or host_arch == 'i86pc':
host_arch = 'ia32'
elif host_arch == 'arm64':
pass
elif host_arch.startswith('arm'):
host_arch = 'arm'
elif host_arch.startswith('mips'):
Expand Down

0 comments on commit 6ebd04c

Please sign in to comment.