Merge pull request #1113 from esc/cherry_pick_1104_for_main

Merge pull request #1104 from sklam/misc/osx_wheel_fix
numba · Jan 14, 2025 · d1a62a6 · d1a62a6
2 parents 1b014ec + 33b9713
commit d1a62a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/conda-recipes/llvmdev_manylinux/build.sh b/conda-recipes/llvmdev_manylinux/build.sh
@@ -63,6 +63,7 @@ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
       -DLLVM_OPTIMIZED_TABLEGEN=ON \
       -DCMAKE_POLICY_DEFAULT_CMP0111=NEW \
       -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 \

diff --git a/conda-recipes/llvmdev_manylinux/meta.yaml b/conda-recipes/llvmdev_manylinux/meta.yaml
@@ -41,13 +41,13 @@ requirements:
     - 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]