From b4c9e5434706137a9b858ff90625da4f6e20c654 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Thu, 2 Nov 2023 19:56:08 +1000 Subject: [PATCH] Jemalloc no longer seems to fail in cross-compile builds --- build/runner/src/bundle/binary.rs | 2 +- qt/bundle/pyoxidizer.bzl | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/build/runner/src/bundle/binary.rs b/build/runner/src/bundle/binary.rs index f16728069..4ac281b73 100644 --- a/build/runner/src/bundle/binary.rs +++ b/build/runner/src/bundle/binary.rs @@ -12,7 +12,7 @@ use crate::run::run_command; pub fn build_bundle_binary() { let mut features = String::from("build-mode-prebuilt-artifacts"); - if cfg!(target_os = "linux") || (cfg!(target_os = "macos") && cfg!(target_arch = "aarch64")) { + if cfg!(target_os = "linux") || cfg!(target_os = "macos") { features.push_str(",global-allocator-jemalloc,allocator-jemalloc"); } diff --git a/qt/bundle/pyoxidizer.bzl b/qt/bundle/pyoxidizer.bzl index 9bf48dc5a..858290589 100644 --- a/qt/bundle/pyoxidizer.bzl +++ b/qt/bundle/pyoxidizer.bzl @@ -130,9 +130,6 @@ def make_exe(): # detected libs do not need this, but we add extra afterwards python_config.module_search_paths = ["$ORIGIN/lib"] python_config.optimization_level = 2 - if BUILD_TARGET_TRIPLE == "x86_64-apple-darwin": - # jemalloc currently fails to build when run under Rosetta - python_config.allocator_backend = "default" python_config.run_command = "import aqt; aqt.run()"