From ffe83fa43b9269f1e899122ba7825025df173b5a Mon Sep 17 00:00:00 2001 From: Jack Koenig Date: Tue, 30 Mar 2021 16:47:35 -0700 Subject: Fix Mill support for non-M1 Macs (#2165) * Fix Mill support for non-M1 Macs * Update build.sc Co-authored-by: edwardcwang Co-authored-by: edwardcwang --- build.sc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.sc b/build.sc index 5f3d9730..4ac60a51 100644 --- a/build.sc +++ b/build.sc @@ -135,11 +135,12 @@ class firrtlCrossModule(val crossScalaVersion: String) extends CrossSbtModule wi val ppcle_64 = architecture().equals("ppc64le") val s390x = architecture().equals("s390x") val x86_32 = architecture().matches("^(x8632|x86|i[3-6]86|ia32|x32)$") - val x86_64 = architecture().matches("^(x8664|amd64|ia32e|em64t|x64)$") + val x86_64 = architecture().matches("^(x8664|amd64|ia32e|em64t|x64|x86_64)$") val protocBinary = if (isMac) - if (aarch_64) "osx-x86_64" + // MacOS ARM 64-bit still supports x86_64 binaries via Rosetta 2 + if (aarch_64 || x86_64) "osx-x86_64" else throw new Exception("mill cannot detect your architecture of your Mac") else if (isLinux) if (aarch_64) "linux-aarch_64" -- cgit v1.2.3