Merge pull request #142 from h-vetinari/19

LLVM v19.1.1
conda-forge · Oct 10, 2024 · 47960cc · 47960cc
2 parents e070d61 + 091e14d
commit 47960cc
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 41 deletions.
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/...6_64-apple-darwin13.4.0version19.1.0.yaml → ...6_64-apple-darwin13.4.0version19.1.1.yaml b/...6_64-apple-darwin13.4.0version19.1.0.yaml → ...6_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/...rm64-apple-darwin20.0.0version19.1.0.yaml → ...rm64-apple-darwin20.0.0version19.1.1.yaml b/...rm64-apple-darwin20.0.0version19.1.0.yaml → ...rm64-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/...6_64-apple-darwin13.4.0version19.1.0.yaml → ...6_64-apple-darwin13.4.0version19.1.1.yaml b/...6_64-apple-darwin13.4.0version19.1.0.yaml → ...6_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/...rm64-apple-darwin20.0.0version19.1.0.yaml → ...rm64-apple-darwin20.0.0version19.1.1.yaml b/...rm64-apple-darwin20.0.0version19.1.0.yaml → ...rm64-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/...6_64-apple-darwin13.4.0version19.1.0.yaml → ...6_64-apple-darwin13.4.0version19.1.1.yaml b/...6_64-apple-darwin13.4.0version19.1.0.yaml → ...6_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/...rm64-apple-darwin20.0.0version19.1.0.yaml → ...rm64-apple-darwin20.0.0version19.1.1.yaml b/...rm64-apple-darwin20.0.0version19.1.0.yaml → ...rm64-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
diff --git 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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -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:
@@ Expand Down @@