diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 156763b..4cdfd62 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -16,8 +16,8 @@ jobs: CONFIG: linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.8 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.0: - CONFIG: linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.0 + linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1: + CONFIG: linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6: @@ -28,8 +28,8 @@ jobs: CONFIG: linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.8 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.0: - CONFIG: linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.0 + linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1: + CONFIG: linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 9377d34..8540a0f 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -14,8 +14,8 @@ jobs: osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.8: CONFIG: osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.8 UPLOAD_PACKAGES: 'True' - osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.0: - CONFIG: osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.0 + osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1: + CONFIG: osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1 UPLOAD_PACKAGES: 'True' osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6: CONFIG: osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6 @@ -23,8 +23,8 @@ jobs: osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.8: CONFIG: osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.8 UPLOAD_PACKAGES: 'True' - osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.0: - CONFIG: osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.0 + osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1: + CONFIG: osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1 UPLOAD_PACKAGES: 'True' osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6: CONFIG: osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6 @@ -32,8 +32,8 @@ jobs: osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.8: CONFIG: osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.8 UPLOAD_PACKAGES: 'True' - osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.0: - CONFIG: osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.0 + osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1: + CONFIG: osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1 UPLOAD_PACKAGES: 'True' osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6: CONFIG: osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6 @@ -41,8 +41,8 @@ jobs: osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.8: CONFIG: osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.8 UPLOAD_PACKAGES: 'True' - osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.0: - CONFIG: osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.0 + osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1: + CONFIG: osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.0.yaml b/.ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1.yaml similarity index 98% rename from .ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.0.yaml rename to .ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1.yaml index 9a30ff8..3b1bb29 100644 --- a/.ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.0.yaml +++ b/.ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1.yaml @@ -25,7 +25,7 @@ uname_kernel_release: uname_machine: - x86_64 version: -- 19.1.0 +- 19.1.1 zip_keys: - - cross_target_platform - macos_machine diff --git a/.ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.0.yaml b/.ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1.yaml similarity index 98% rename from .ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.0.yaml rename to .ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1.yaml index f720b02..e06e8ce 100644 --- a/.ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.0.yaml +++ b/.ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1.yaml @@ -25,7 +25,7 @@ uname_kernel_release: uname_machine: - arm64 version: -- 19.1.0 +- 19.1.1 zip_keys: - - cross_target_platform - macos_machine diff --git a/.ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.0.yaml b/.ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1.yaml similarity index 98% rename from .ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.0.yaml rename to .ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1.yaml index 2a5290b..99dda06 100644 --- a/.ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.0.yaml +++ b/.ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1.yaml @@ -23,7 +23,7 @@ uname_kernel_release: uname_machine: - x86_64 version: -- 19.1.0 +- 19.1.1 zip_keys: - - cross_target_platform - macos_machine diff --git a/.ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.0.yaml b/.ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1.yaml similarity index 98% rename from .ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.0.yaml rename to .ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1.yaml index e957cff..08348c2 100644 --- a/.ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.0.yaml +++ b/.ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1.yaml @@ -23,7 +23,7 @@ uname_kernel_release: uname_machine: - arm64 version: -- 19.1.0 +- 19.1.1 zip_keys: - - cross_target_platform - macos_machine diff --git a/.ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.0.yaml b/.ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1.yaml similarity index 98% rename from .ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.0.yaml rename to .ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1.yaml index 5d6102b..5858597 100644 --- a/.ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.0.yaml +++ b/.ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1.yaml @@ -23,7 +23,7 @@ uname_kernel_release: uname_machine: - x86_64 version: -- 19.1.0 +- 19.1.1 zip_keys: - - cross_target_platform - macos_machine diff --git a/.ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.0.yaml b/.ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1.yaml similarity index 98% rename from .ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.0.yaml rename to .ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1.yaml index 793a9f6..6ea6156 100644 --- a/.ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.0.yaml +++ b/.ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1.yaml @@ -23,7 +23,7 @@ uname_kernel_release: uname_machine: - arm64 version: -- 19.1.0 +- 19.1.1 zip_keys: - - cross_target_platform - macos_machine diff --git a/README.md b/README.md index 8bdea07..ca1a1e7 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,8 @@ Package license: BSD-3-Clause Summary: clang compilers for conda-build 3 -About clang_bootstrap_osx-arm64 -------------------------------- +About clang_bootstrap_osx-64 +---------------------------- Home: https://llvm.org @@ -22,8 +22,8 @@ Package license: Apache-2.0 Summary: clang compiler components in one package for bootstrapping clang -About clang_bootstrap_osx-64 ----------------------------- +About clang_bootstrap_osx-arm64 +------------------------------- Home: https://llvm.org @@ -63,10 +63,10 @@ Current build status - linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.0 + linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1 - variant + variant @@ -84,10 +84,10 @@ Current build status - linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.0 + linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1 - variant + variant @@ -105,10 +105,10 @@ Current build status - osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.0 + osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1 - variant + variant @@ -126,10 +126,10 @@ Current build status - osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.0 + osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1 - variant + variant @@ -147,10 +147,10 @@ Current build status - osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.0 + osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1 - variant + variant @@ -168,10 +168,10 @@ Current build status - osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.0 + osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1 - variant + variant diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 626b3e8..aeee603 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -11,7 +11,7 @@ MACOSX_DEPLOYMENT_TARGET: # [linux] version: - 17.0.6 - 18.1.8 - - 19.1.0 + - 19.1.1 # everything below is zipped cross_target_platform: diff --git a/recipe/install-clang.sh b/recipe/install-clang.sh index 094f176..e91a693 100644 --- a/recipe/install-clang.sh +++ b/recipe/install-clang.sh @@ -7,9 +7,9 @@ CHOST=${macos_machine} pushd "${PREFIX}"/bin ln -s clang ${CHOST}-clang ln -s clang-cpp ${CHOST}-clang-cpp - if [[ "${CBUILD}" != ${CHOST} ]] && [[ "${target_platform}" != linux-* ]]; then - # on linux, the `clang` package already has a $TRIPLE-clang, see - # https://github.com/conda-forge/clangdev-feedstock/pull/251 + if [[ "${CBUILD}" != ${CHOST} ]] && [[ "${target_platform}" != linux-* || ( ${version} != "17.0.6" && ${version} != "18.1.8") ]]; then + # before v19.1.1, `clang` on linux already had this symlink, see + # https://github.com/conda-forge/clangdev-feedstock/pull/322 ln -s clang ${CBUILD}-clang ln -s clang-cpp ${CBUILD}-clang-cpp fi diff --git a/recipe/install-clangxx.sh b/recipe/install-clangxx.sh index cd38846..7c0e9a6 100644 --- a/recipe/install-clangxx.sh +++ b/recipe/install-clangxx.sh @@ -7,9 +7,9 @@ echo CHOST is ${CHOST} pushd "${PREFIX}"/bin ln -s clang++ ${CHOST}-clang++ - if [[ "${CHOST}" != "${CBUILD}" ]] && [[ "${target_platform}" != linux-* ]]; then - # on linux, the `clangxx` package already has a $TRIPLE-clang++, see - # https://github.com/conda-forge/clangdev-feedstock/pull/251 + if [[ "${CBUILD}" != ${CHOST} ]] && [[ "${target_platform}" != linux-* || ( ${version} != "17.0.6" && ${version} != "18.1.8") ]]; then + # before v19.1.1, `clangxx` on linux already had this symlink, see + # https://github.com/conda-forge/clangdev-feedstock/pull/322 ln -s clang++ ${CBUILD}-clang++ fi popd