diff --git a/src/llvm_state.cpp b/src/llvm_state.cpp index af5fc6d6d..8d4f45ff8 100644 --- a/src/llvm_state.cpp +++ b/src/llvm_state.cpp @@ -293,7 +293,11 @@ llvm::orc::JITTargetMachineBuilder create_jit_tmb(unsigned opt_level, code_model #if defined(HEYOKA_ARCH_X86) code_model::small, code_model::kernel, code_model::medium, code_model::large #elif defined(HEYOKA_ARCH_ARM) - code_model::tiny, code_model::small, code_model::large + // NOTE: tiny code model not supported on OSX. +#if !defined(__APPLE__) + code_model::tiny, +#endif + code_model::small, code_model::large #elif defined(HEYOKA_ARCH_PPC) code_model::small, code_model::medium, code_model::large #else diff --git a/test/llvm_state.cpp b/test/llvm_state.cpp index 821524df3..8acd5929e 100644 --- a/test/llvm_state.cpp +++ b/test/llvm_state.cpp @@ -444,8 +444,8 @@ TEST_CASE("code model") REQUIRE(oss.str() == "small"); } - // code_model::tiny not supported on x86 or ppc. -#if defined(HEYOKA_ARCH_X86) || defined(HEYOKA_ARCH_PPC) + // code_model::tiny not supported on x86 or ppc or OSX +#if defined(HEYOKA_ARCH_X86) || defined(HEYOKA_ARCH_PPC) || defined(__APPLE__) { std::ostringstream oss; diff --git a/tools/gha_osx_arm64_static.sh b/tools/gha_osx_arm64_static.sh index 165d9ae3a..78f9e45da 100644 --- a/tools/gha_osx_arm64_static.sh +++ b/tools/gha_osx_arm64_static.sh @@ -11,7 +11,7 @@ wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge export deps_dir=$HOME/local export PATH="$HOME/miniconda/bin:$PATH" bash miniconda.sh -b -p $HOME/miniconda -mamba create -y -p $deps_dir c-compiler zlib cxx-compiler libcxx cmake ninja \ +mamba create -y -p $deps_dir 'c-compiler<1.8' zlib 'cxx-compiler<1.8' libcxx cmake ninja \ llvmdev tbb-devel tbb libboost-devel sleef xtensor xtensor-blas blas \ blas-devel fmt spdlog 'mppp=1.*' source activate $deps_dir diff --git a/tools/gha_osx_x86.sh b/tools/gha_osx_x86.sh index eb1b8acfe..0fbdbbad2 100644 --- a/tools/gha_osx_x86.sh +++ b/tools/gha_osx_x86.sh @@ -11,7 +11,7 @@ wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge export deps_dir=$HOME/local export PATH="$HOME/miniconda/bin:$PATH" bash miniconda.sh -b -p $HOME/miniconda -mamba create -y -p $deps_dir c-compiler zlib cxx-compiler libcxx 'cmake>=3.18' ninja \ +mamba create -y -p $deps_dir 'c-compiler<1.8' zlib 'cxx-compiler<1.8' libcxx cmake ninja \ llvmdev tbb-devel tbb libboost-devel sleef xtensor xtensor-blas blas \ blas-devel fmt spdlog 'mppp=1.*' source activate $deps_dir diff --git a/tools/gha_osx_x86_static.sh b/tools/gha_osx_x86_static.sh index 05204731c..9d5c87e56 100644 --- a/tools/gha_osx_x86_static.sh +++ b/tools/gha_osx_x86_static.sh @@ -11,7 +11,7 @@ wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge export deps_dir=$HOME/local export PATH="$HOME/miniconda/bin:$PATH" bash miniconda.sh -b -p $HOME/miniconda -mamba create -y -p $deps_dir c-compiler zlib cxx-compiler libcxx 'cmake>=3.18' ninja \ +mamba create -y -p $deps_dir 'c-compiler<1.8' zlib 'cxx-compiler<1.8' libcxx cmake ninja \ llvmdev tbb-devel tbb libboost-devel sleef xtensor xtensor-blas blas \ blas-devel fmt spdlog 'mppp=1.*' source activate $deps_dir