# HG changeset patch # User wenzelm # Date 1620744942 -7200 # Node ID 70d3c7009a650827bd944837f7927e597823b753 # Parent 7404f2e1d0926951fec2e184d9225bd8ca45d1fa proper support for macOS/Rosetta: let "uname -m" report arm64 instead of x86_64; diff -r 7404f2e1d092 -r 70d3c7009a65 src/Pure/Admin/build_polyml.scala --- a/src/Pure/Admin/build_polyml.scala Tue May 11 16:30:24 2021 +0200 +++ b/src/Pure/Admin/build_polyml.scala Tue May 11 16:55:42 2021 +0200 @@ -63,9 +63,16 @@ /* bash */ def bash( - cwd: Path, script: String, redirect: Boolean = false, echo: Boolean = false): Process_Result = + cwd: Path, script: String, + redirect: Boolean = false, + echo: Boolean = false): Process_Result = { - progress.bash(mingw.bash_script(script), cwd = cwd.file, redirect = redirect, echo = echo) + val script1 = + if (platform.is_arm && platform.is_macos) { + "arch -arch arm64 bash -c " + Bash.string(script) + } + else mingw.bash_script(script) + progress.bash(script1, cwd = cwd.file, redirect = redirect, echo = echo) }