conda-forge · isuruf · Oct 14, 2020 · Aug 7, 2020 · Aug 7, 2020 · Aug 7, 2020
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.ci_support/linux_.yaml → ...ame_machinex86_64use_llvm_toolsFalse.yaml b/.ci_support/linux_.yaml → ...ame_machinex86_64use_llvm_toolsFalse.yaml
@@ -1,7 +1,9 @@
 channel_sources:
-- conda-forge,defaults
+- conda-forge/label/llvm_rc,conda-forge,defaults
 channel_targets:
-- conda-forge main
+- conda-forge llvm_rc
+cross_platform:
+- osx-64
 cxx_compiler:
 - gxx
 cxx_compiler_version:
@@ -17,5 +19,16 @@ pin_run_as_build:
     max_pin: x
   zlib:
     max_pin: x.x
+target_platform:
+- linux-64
+uname_machine:
+- x86_64
+use_llvm_tools:
+- 'False'
+zip_keys:
+- - macos_machine
+  - cross_platform
+  - uname_machine
+  - use_llvm_tools
 zlib:
 - '1.2'
diff --git a/...earm64-apple-darwin20.0.0target_platformlinux-64uname_machinearm64use_llvm_toolsTrue.yaml b/...earm64-apple-darwin20.0.0target_platformlinux-64uname_machinearm64use_llvm_toolsTrue.yaml
@@ -0,0 +1,34 @@
+channel_sources:
+- conda-forge/label/llvm_rc,conda-forge,defaults
+channel_targets:
+- conda-forge llvm_rc
+cross_platform:
+- osx-arm64
+cxx_compiler:
+- gxx
+cxx_compiler_version:
+- '7'
+docker_image:
+- condaforge/linux-anvil-comp7
+libuuid:
+- 2.32.1
+macos_machine:
+- arm64-apple-darwin20.0.0
+pin_run_as_build:
+  libuuid:
+    max_pin: x
+  zlib:
+    max_pin: x.x
+target_platform:
+- linux-64
+uname_machine:
+- arm64
+use_llvm_tools:
+- 'True'
+zip_keys:
+- - macos_machine
+  - cross_platform
+  - uname_machine
+  - use_llvm_tools
+zlib:
+- '1.2'
diff --git a/.ci_support/osx_.yaml → ...ame_machinex86_64use_llvm_toolsFalse.yaml b/.ci_support/osx_.yaml → ...ame_machinex86_64use_llvm_toolsFalse.yaml
@@ -1,9 +1,11 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
 channel_sources:
-- conda-forge,defaults
+- conda-forge/label/llvm_rc,conda-forge,defaults
 channel_targets:
-- conda-forge main
+- conda-forge llvm_rc
+cross_platform:
+- osx-64
 cxx_compiler:
 - clang_bootstrap
 cxx_compiler_version:
@@ -15,5 +17,16 @@ macos_min_version:
 pin_run_as_build:
   zlib:
     max_pin: x.x
+target_platform:
+- osx-64
+uname_machine:
+- x86_64
+use_llvm_tools:
+- 'False'
+zip_keys:
+- - macos_machine
+  - cross_platform
+  - uname_machine
+  - use_llvm_tools
 zlib:
 - '1.2'
diff --git a/...inearm64-apple-darwin20.0.0target_platformosx-64uname_machinearm64use_llvm_toolsTrue.yaml b/...inearm64-apple-darwin20.0.0target_platformosx-64uname_machinearm64use_llvm_toolsTrue.yaml
@@ -0,0 +1,32 @@
+MACOSX_DEPLOYMENT_TARGET:
+- '10.9'
+channel_sources:
+- conda-forge/label/llvm_rc,conda-forge,defaults
+channel_targets:
+- conda-forge llvm_rc
+cross_platform:
+- osx-arm64
+cxx_compiler:
+- clang_bootstrap
+cxx_compiler_version:
+- '*'
+macos_machine:
+- arm64-apple-darwin20.0.0
+macos_min_version:
+- '10.9'
+pin_run_as_build:
+  zlib:
+    max_pin: x.x
+target_platform:
+- osx-64
+uname_machine:
+- arm64
+use_llvm_tools:
+- 'True'
+zip_keys:
+- - macos_machine
+  - cross_platform
+  - uname_machine
+  - use_llvm_tools
+zlib:
+- '1.2'
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/README.md b/README.md
diff --git a/conda-forge.yml b/conda-forge.yml
@@ -1,2 +1 @@
-upload_on_branch: master
 conda_forge_output_validation: true
diff --git a/recipe/build.sh b/recipe/build.sh
@@ -13,7 +13,7 @@ fi
 export cctools_cv_tapi_support=yes
 
 pushd cctools
-  LLVM_LTO_LIBRARY=$(find $PREFIX/lib -name "libLTO*${SHLIB_EXT}")
+  LLVM_LTO_LIBRARY=$(find $PREFIX/lib -name "libLTO.*.*")
   LLVM_LTO_LIBRARY="$(basename $LLVM_LTO_LIBRARY)"
   sed -i.bak "s/libLTO.dylib/${LLVM_LTO_LIBRARY}/g" ld64/src/ld/InputFiles.cpp
   sed -i.bak "s@llvm/libLTO.so@${LLVM_LTO_LIBRARY}@g" ld64/src/ld/InputFiles.cpp
@@ -31,17 +31,6 @@ popd
 export CXXFLAGS="$CXXFLAGS -O2 -gdwarf-4"
 export CFLAGS="$CFLAGS -O2 -gdwarf-4"
 
-if [[ ${MACOSX_DEPLOYMENT_TARGET} == 10.10 ]]; then
-  DARWIN_TARGET=x86_64-apple-darwin14.5.0
-else
-  DARWIN_TARGET=x86_64-apple-darwin13.4.0
-fi
-
-if [[ -z ${DARWIN_TARGET} ]]; then
-  echo "Need a valid DARWIN_TARGET"
-  exit 1
-fi
-
 pushd ${SRC_DIR}/cctools
   ./autogen.sh
 popd
@@ -52,8 +41,9 @@ pushd cctools_build_final
     --prefix=${PREFIX} \
     --host=${HOST} \
     --build=${BUILD} \
-    --target=${DARWIN_TARGET} \
+    --target=${macos_machine} \
     --disable-static \
+    --with-libtapi=${PREFIX} \
     --enable-shared || (cat config.log && cat config.status && false)
   cat config.log
   cat config.status

diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -1,5 +1,20 @@
 macos_machine:
   - x86_64-apple-darwin13.4.0
+  - arm64-apple-darwin20.0.0
+cross_platform:
+  - osx-64
+  - osx-arm64
+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]
@@ -16,3 +31,8 @@ c_compiler_version:     # [osx]
   - "*"                 # [osx]
 cxx_compiler_version:   # [osx]
   - "*"                 # [osx]
+
+channel_targets:
+  - conda-forge llvm_rc
+channel_sources:
+  - conda-forge/label/llvm_rc,conda-forge,defaults
diff --git a/recipe/install-cctools-symlinks.sh b/recipe/install-cctools-symlinks.sh
@@ -2,6 +2,6 @@ prefix="${macos_machine}-"
 
 pushd $PREFIX/bin
   for tool in $(ls ${prefix}*); do
-    ln -s $PREFIX/bin/$tool $PREFIX/bin/${tool:${#prefix}}
+    ln -s $PREFIX/bin/$tool $PREFIX/bin/${tool:${#prefix}} || true
   done
 popd
diff --git a/recipe/install-cctools.sh b/recipe/install-cctools.sh
@@ -13,3 +13,9 @@ 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