diff options
| author | Jack Koenig | 2021-03-30 16:47:35 -0700 |
|---|---|---|
| committer | GitHub | 2021-03-30 23:47:35 +0000 |
| commit | ffe83fa43b9269f1e899122ba7825025df173b5a (patch) | |
| tree | 37fef98012c14132ee6dcced0000b889fd1266fa | |
| parent | 78ece783cafa5bf7b5c367e21d7949250c52b947 (diff) | |
Fix Mill support for non-M1 Macs (#2165)
* Fix Mill support for non-M1 Macs
* Update build.sc
Co-authored-by: edwardcwang <edwardcwang@users.noreply.github.com>
Co-authored-by: edwardcwang <edwardcwang@users.noreply.github.com>
| -rw-r--r-- | build.sc | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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" |