diff --git a/build/configure/src/aqt.rs b/build/configure/src/aqt.rs index c8d396ae1..02557ca4a 100644 --- a/build/configure/src/aqt.rs +++ b/build/configure/src/aqt.rs @@ -347,6 +347,7 @@ fn build_macos_helper(build: &mut Build) -> Result<()> { inputs: hashmap! { "script" => inputs!["qt/mac/helper_build.py"], "in" => inputs![glob!["qt/mac/*.swift"]], + "" => inputs!["out/env"], }, outputs: hashmap! { "out" => vec!["qt/_aqt/data/lib/libankihelper.dylib"], diff --git a/qt/mac/helper_build.py b/qt/mac/helper_build.py index b2aa74016..4edbd05c1 100644 --- a/qt/mac/helper_build.py +++ b/qt/mac/helper_build.py @@ -1,6 +1,7 @@ # Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html +import os import platform import subprocess import sys @@ -10,7 +11,7 @@ out_dylib, *src_files = sys.argv[1:] out_dir = Path(out_dylib).parent.resolve() src_dir = Path(src_files[0]).parent.resolve() -if platform.machine() == "arm64": +if platform.machine() == "arm64" and not os.environ.get("MAC_X86"): target = "arm64-apple-macos11" else: target = "x86_64-apple-macos10.14"