From fcb8a84a61b0bea3ce1a5ff891bbdc1e199c3105 Mon Sep 17 00:00:00 2001 From: Siu Kwan Lam <1929845+sklam@users.noreply.github.com> Date: Fri, 22 Nov 2024 14:42:47 -0600 Subject: [PATCH 1/2] Fix osx wheel build --- conda-recipes/llvmdev_manylinux/build.sh | 2 +- conda-recipes/llvmdev_manylinux/meta.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conda-recipes/llvmdev_manylinux/build.sh b/conda-recipes/llvmdev_manylinux/build.sh index 9484cf9ff..8e8de2917 100644 --- a/conda-recipes/llvmdev_manylinux/build.sh +++ b/conda-recipes/llvmdev_manylinux/build.sh @@ -62,7 +62,7 @@ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DLLVM_ENABLE_Z3_SOLVER=OFF \ -DLLVM_OPTIMIZED_TABLEGEN=ON \ -DCMAKE_POLICY_DEFAULT_CMP0111=NEW \ - -DCOMPILER_RT_BUILD_BUILTINS=ON \ + -DCOMPILER_RT_BUILD_BUILTINS=OFF \ -DCOMPILER_RT_BUILTINS_HIDE_SYMBOLS=OFF \ -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \ -DCOMPILER_RT_BUILD_CRT=OFF \ diff --git a/conda-recipes/llvmdev_manylinux/meta.yaml b/conda-recipes/llvmdev_manylinux/meta.yaml index cc7868d4c..a3f9e2a22 100644 --- a/conda-recipes/llvmdev_manylinux/meta.yaml +++ b/conda-recipes/llvmdev_manylinux/meta.yaml @@ -32,17 +32,17 @@ build: requirements: build: # Do not use the compiler - # - {{ compiler('cxx') }} + - {{ compiler('cxx') }} # [osx] - cmake - ninja - python >=3 - # - libcxx # it is not defined{{ cxx_compiler_version }} # [osx] + - libcxx # it is not defined{{ cxx_compiler_version }} # [osx] - patch # [not win] # - m2-patch # [win] - git # [(linux and x86_64)] host: - #- libcxx # it is not defined{{ cxx_compiler_version }} # [osx] + - libcxx # it is not defined{{ cxx_compiler_version }} # [osx] - libffi # [unix] # # libxml2 supports a windows-only feature, see https://github.com/llvm/llvm-project/blob/llvmorg-17.0.6/llvm/include/llvm/WindowsManifest/WindowsManifestMerger.h # - libxml2 # [win] From 135be02cd38b0485dfb2ee55093a54aae803ef85 Mon Sep 17 00:00:00 2001 From: Siu Kwan Lam <1929845+sklam@users.noreply.github.com> Date: Wed, 27 Nov 2024 15:03:35 -0600 Subject: [PATCH 2/2] Turn off iOS support --- conda-recipes/llvmdev_manylinux/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conda-recipes/llvmdev_manylinux/build.sh b/conda-recipes/llvmdev_manylinux/build.sh index 8e8de2917..f39a8991b 100644 --- a/conda-recipes/llvmdev_manylinux/build.sh +++ b/conda-recipes/llvmdev_manylinux/build.sh @@ -62,7 +62,8 @@ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DLLVM_ENABLE_Z3_SOLVER=OFF \ -DLLVM_OPTIMIZED_TABLEGEN=ON \ -DCMAKE_POLICY_DEFAULT_CMP0111=NEW \ - -DCOMPILER_RT_BUILD_BUILTINS=OFF \ + -DCOMPILER_RT_BUILD_BUILTINS=ON \ + -DCOMPILER_RT_ENABLE_IOS=OFF \ -DCOMPILER_RT_BUILTINS_HIDE_SYMBOLS=OFF \ -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \ -DCOMPILER_RT_BUILD_CRT=OFF \