remove use_llvm_tools option

conda-forge · Oct 14, 2020 · a674923 · a674923
1 parent 6362e00
commit a674923
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 15 deletions.
diff --git a/...4_cross_platformosx-64macos_machinex86_64-apple-darwin13.4.0target_platformosx-arm64.yaml b/...4_cross_platformosx-64macos_machinex86_64-apple-darwin13.4.0target_platformosx-arm64.yaml
@@ -1,7 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
 channel_sources:
-- conda-forge/label/llvm_rc,conda-forge,https://conda-web.anaconda.org/conda-forge
+- https://conda-web.anaconda.org/conda-forge,conda-forge/label/llvm_rc
 channel_targets:
 - conda-forge main
 cross_platform:

diff --git a/...cross_platformosx-arm64macos_machinearm64-apple-darwin20.0.0target_platformosx-arm64.yaml b/...cross_platformosx-arm64macos_machinearm64-apple-darwin20.0.0target_platformosx-arm64.yaml
@@ -1,7 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
 channel_sources:
-- conda-forge/label/llvm_rc,conda-forge,https://conda-web.anaconda.org/conda-forge
+- https://conda-web.anaconda.org/conda-forge,conda-forge/label/llvm_rc
 channel_targets:
 - conda-forge main
 cross_platform:

diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -7,14 +7,10 @@ cross_platform:
 uname_machine:
   - x86_64
   - arm64
-use_llvm_tools:
-  - False
-  - True
 zip_keys:
   - - macos_machine
     - cross_platform
     - uname_machine
-    - use_llvm_tools
 cxx_compiler:
   - clang_bootstrap  # [osx]
   - gxx              # [linux]

diff --git a/recipe/install-cctools.sh b/recipe/install-cctools.sh
@@ -13,9 +13,3 @@ pushd "${PREFIX}"
   # This is packaged in ld64
   rm bin/*-ld
 popd
-
-if [[ "$use_llvm_tools" == "True" ]]; then
-  for tool in lipo nm size; do
-     ln -sf $PREFIX/bin/llvm-$tool $PREFIX/bin/$macos_machine-$tool
-  done
-fi
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -59,21 +59,18 @@ outputs:
         - zlib
         - llvmdev {{ llvm_version }}.*
         - llvm {{ llvm_version }}.*
-        - llvm-tools {{ llvm_version }}.*                                 # [use_llvm_tools]
         - tapi
         - libcxx  # [osx]
         - {{ pin_subpackage("ld64_" + cross_platform, max_pin="x.x") }}
       run:
         - libcxx  # [osx]
-        - llvm-tools {{ llvm_version }}.*                                 # [use_llvm_tools]
         - {{ pin_subpackage("ld64_" + cross_platform, max_pin="x.x") }}
         - ldid
       run_constrained:
         - ld64 {{ ld64_version }}.*
         - cctools {{ cctools_version }}.*
     test:
       commands:
-        - echo {{ use_llvm_tools }}
         # For arm64, cctools as calls the clang integrated assembler. Don't check for it
         - test -f $PREFIX/libexec/as/x86_64/as
         - test -f $PREFIX/bin/{{ macos_machine }}-as