diff options
| author | Nathan Froyd <froydnj@mozilla.com> | 2020-08-03 20:43:00 +0000 |
|---|---|---|
| committer | Nathan Froyd <froydnj@mozilla.com> | 2020-08-03 20:43:00 +0000 |
| commit | cb0ae610a57f88e1970a324048a02878822683a3 (patch) | |
| tree | acb5edbf96cf92104c2c0bc6923cfb08b136eca6 /coreconf | |
| parent | 9dc1b7f5b873c71b59a67eb1de1cb4e90a185f1e (diff) | |
| download | nss-hg-cb0ae610a57f88e1970a324048a02878822683a3.tar.gz | |
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
Diffstat (limited to 'coreconf')
| -rw-r--r-- | coreconf/detect_host_arch.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/coreconf/detect_host_arch.py b/coreconf/detect_host_arch.py index 8b505a6b5..a32b01034 100644 --- a/coreconf/detect_host_arch.py +++ b/coreconf/detect_host_arch.py @@ -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'): |