clangdev 17.0.1

.ci_support/osx_64_.yaml

@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
+- '10.13'
+MACOSX_SDK_VERSION:
+- '10.13'
 channel_sources:
 - conda-forge
 channel_targets:

recipe/build.sh

@@ -15,8 +15,14 @@ rm -rf llvm-project
 cd clang
 
 IFS='.' read -r -a PKG_VER_ARRAY <<< "${PKG_VERSION}"
+# default SOVER for tagged releases is just the major version
+SOVER_EXT=${VER_ARR[0]}
+if [[ "${PKG_VERSION}" == *dev0 ]]; then
+    # otherwise with git suffix
+    SOVER_EXT="${SOVER_EXT}git"
+fi
 
-sed -i.bak "s/libLTO.dylib/libLTO.${PKG_VER_ARRAY[0]}.dylib/g" lib/Driver/ToolChains/Darwin.cpp
+sed -i.bak "s/libLTO.dylib/libLTO.${SOVER_EXT}.dylib/g" lib/Driver/ToolChains/Darwin.cpp
 
 if [[ "$variant" == "hcc" ]]; then
   CMAKE_ARGS="$CMAKE_ARGS -DKALMAR_BACKEND=HCC_BACKEND_AMDGPU -DHCC_VERSION_STRING=2.7-19365-24e69cd8-24e69cd8-24e69cd8"
@@ -36,6 +42,7 @@ fi
 
 if [[ "$target_platform" == osx* ]]; then
   export CXXFLAGS="$CXXFLAGS -DTARGET_OS_OSX=1"
+  CMAKE_ARGS="$CMAKE_ARGS -DLLVM_ENABLE_LIBCXX=ON"
 fi
 
 # disable -fno-plt due to some GCC bug causing linker errors, see

recipe/conda_build_config.yaml

@@ -3,6 +3,15 @@ c_compiler:          # [osx]
 cxx_compiler:        # [osx]
   - clang_bootstrap  # [osx]
 
+# clang 17 should remain compatible with libcxx 17 (which will be pulled in
+# as a test dependency despite requiring `__osx>=10.13`). Since libcxx has
+# removed workarounds for MacOS<10.13, clang will fail while including
+# the C++ headers, because those rely on things not present in older SDKs.
+MACOSX_SDK_VERSION:         # [osx and x86_64]
+  - "10.13"                 # [osx and x86_64]
+MACOSX_DEPLOYMENT_TARGET:   # [osx and x86_64]
+  - "10.13"                 # [osx and x86_64]
+
 # Starting from LLVM 14, the ABI of libclang doesn't necessarily
 # match the major version anymore - cf. #170 and
 # https://github.com/llvm/llvm-project/issues/54004

recipe/install_clang_tools.sh

@@ -15,13 +15,18 @@ rm -rf lib/lib*.a
 MAJOR_VERSION=$(echo ${PKG_VERSION} | cut -f1 -d".")
 for f in ${PREFIX}/bin/clang-*; do
     if [[ "$(basename $f)" == clang-format-* ]]; then
+        # already got versioned in install_clang_format.sh
+        continue
+    elif [[ "$(basename $f)" == "clang-${MAJOR_VERSION}" ]]; then
+        # installation also creates a versioned clang, no need to re-version it
         continue
     fi
     rm -f ${PREFIX}/bin/$(basename $f)-${MAJOR_VERSION}
     mv $f ${PREFIX}/bin/$(basename $f)-${MAJOR_VERSION};
     ln -s ${PREFIX}/bin/$(basename $f)-${MAJOR_VERSION} $f;
 done
 
-rm ${PREFIX}/bin/clang-${MAJOR_VERSION}-${MAJOR_VERSION}
+# part of output "clang", not "clang-tools"
+rm ${PREFIX}/bin/clang-${MAJOR_VERSION}
 rm ${PREFIX}/bin/clang-cpp-${MAJOR_VERSION}
 rm ${PREFIX}/bin/clang-cl-${MAJOR_VERSION}

recipe/meta.yaml

@@ -1,10 +1,14 @@
-{% set version = "16.0.6" %}
+{% set version = "17.0.1" %}
 {% set major_version = version.split(".")[0] %}
-{% set build_number = 1 %}
+{% set build_number = 0 %}
 
 {% set minor_aware_ext = major_version %}
 {% if version.split(".")[1] | int > 0 %}
-{% set minor_aware_ext = major_version + "." + version.split(".")[1] %}
+{% set minor_aware_ext = major_version ~ "." ~ version.split(".")[1] %}
+{% elif version.split(".")[-1].startswith("rc") %}
+{% set minor_aware_ext = major_version ~ "rc" %}
+{% elif version.split(".")[-1] == "dev0" %}
+{% set minor_aware_ext = major_version ~ "git" %}
 {% endif %}
 
 {% if libclang_soversion is not defined %}
@@ -17,7 +21,7 @@ package:
 
 source:
   - url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz
-    sha256: ce5e71081d17ce9e86d7cbcfa28c4b04b9300f8fb7e78422b1feb6bc52c3028e
+    sha256: b0e42aafc01ece2ca2b42e3526f54bebc4b1f1dc8de6e34f46a0446a13e882b9
     patches:
       - patches/0001-Fix-sysroot-detection-for-linux.patch
       - patches/0002-clang-add-conda-specific-env-var-CONDA_BUILD_SYSROOT.patch
@@ -119,6 +123,7 @@ outputs:
         - {{ pin_subpackage("libclang", exact=True) }}
         - {{ pin_subpackage("libclang-cpp", exact=True) }}
         - {{ pin_compatible("libcxx", max_pin=None) }}  # [osx]
+        - __osx >={{ MACOSX_DEPLOYMENT_TARGET }}        # [osx and x86_64]
         - llvmdev =={{ version }}
     test:
       commands:
@@ -130,9 +135,10 @@ outputs:
   - name: libclang-cpp{{ minor_aware_ext }}
     script: install_libclang_cpp.sh  # [unix]
     files:
-      - lib/libclang-cpp.so.16     # [linux]
-      - lib/libclang-cpp.16.dylib  # [osx]
+      - lib/libclang-cpp.so.{{ minor_aware_ext }}     # [linux]
+      - lib/libclang-cpp.{{ minor_aware_ext }}.dylib  # [osx]
     build:
+      skip: true  # [win]
       track_features:
         - hcc          # [variant=="hcc"]
       string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }}
@@ -143,7 +149,6 @@ outputs:
         - zlib     # [unix]
         - libxml2  # [unix]
         - zstd     # [unix]
-      skip: true  # [win]
     requirements:
       build:
         - {{ compiler('cxx') }}
@@ -160,6 +165,7 @@ outputs:
         - zlib
         - zstd
       run:
+        - __osx >={{ MACOSX_DEPLOYMENT_TARGET }}        # [osx and x86_64]
         - {{ pin_compatible("libcxx", max_pin=None) }}  # [osx]
     test:
       commands:
@@ -202,6 +208,7 @@ outputs:
         - zlib
         - zstd
       run:
+        - __osx >={{ MACOSX_DEPLOYMENT_TARGET }}                              # [osx and x86_64]
         - {{ pin_compatible("libcxx", max_pin=None) }}                        # [osx]
         - {{ pin_subpackage("libclang-cpp" ~ minor_aware_ext, exact=True) }}  # [unix]
     test:
@@ -247,6 +254,7 @@ outputs:
         - zlib
         - zstd
       run:
+        - __osx >={{ MACOSX_DEPLOYMENT_TARGET }}        # [osx and x86_64]
         - {{ pin_compatible("libcxx", max_pin=None) }}  # [osx]
     test:
       commands:
@@ -311,6 +319,7 @@ outputs:
         - zlib
         - zstd
       run:
+        - __osx >={{ MACOSX_DEPLOYMENT_TARGET }}                      # [osx and x86_64]
         - {{ pin_compatible("libcxx", max_pin=None) }}                # [osx]
         - {{ pin_subpackage("libclang" ~ libclang_soversion, exact=True) }}
     test:
@@ -354,6 +363,7 @@ outputs:
         - zlib
         - zstd
       run:
+        - __osx >={{ MACOSX_DEPLOYMENT_TARGET }}                              # [osx and x86_64]
         - {{ pin_compatible("libcxx", max_pin=None) }}                        # [osx]
         - {{ pin_subpackage("libclang-cpp" ~ minor_aware_ext, exact=True) }}  # [unix]
       run_constrained:
@@ -397,7 +407,8 @@ outputs:
         - zlib
         - zstd
       run:
-        - gcc_impl_{{ target_platform }}  # [linux]
+        - gcc_impl_{{ target_platform }}            # [linux]
+        - __osx >={{ MACOSX_DEPLOYMENT_TARGET }}    # [osx and x86_64]
         - {{ pin_subpackage("clang-" ~ major_version, exact=True) }}
     test:
       commands:
@@ -427,6 +438,7 @@ outputs:
         - zlib
         - zstd
       run:
+        - __osx >={{ MACOSX_DEPLOYMENT_TARGET }}        # [osx and x86_64]
         - {{ pin_subpackage("clang", exact=True) }}
     test:
       requires:
@@ -476,6 +488,7 @@ outputs:
         - zlib
         - zstd
       run:
+        - __osx >={{ MACOSX_DEPLOYMENT_TARGET }}                                  # [osx and x86_64]
         - {{ pin_compatible("libcxx", max_pin=None) }}                            # [osx]
         - {{ pin_subpackage("libclang-cpp" ~ minor_aware_ext, max_pin="x.x") }}   # [unix]
     test:
@@ -522,6 +535,7 @@ outputs:
         - zlib
         - zstd
       run:
+        - __osx >={{ MACOSX_DEPLOYMENT_TARGET }}                                 # [osx and x86_64]
         - {{ pin_compatible("libcxx", max_pin=None) }}                           # [osx]
         - {{ pin_subpackage("libclang-cpp" ~ minor_aware_ext, max_pin="x.x") }}  # [unix]
         - {{ pin_subpackage("clang-format-" ~ major_version, exact=True) }}      # [unix]
@@ -541,7 +555,6 @@ outputs:
       ignore_run_exports_from:
         # the build fails if it doesn't find the following, but it's not used
         - zlib     # [unix]
-        - libxml2  # [unix]
         - zstd     # [unix]
     requirements:
       build:
@@ -567,6 +580,7 @@ outputs:
         - zstd
       run:
         - ucrt                                          # [win]
+        - __osx >={{ MACOSX_DEPLOYMENT_TARGET }}        # [osx and x86_64]
         - {{ pin_compatible("libcxx", max_pin=None) }}  # [osx]
         - {{ pin_subpackage("clang-format", exact=True) }}
         - {{ pin_subpackage("libclang" ~ libclang_soversion, max_pin=None) }}

recipe/patches/0001-Fix-sysroot-detection-for-linux.patch

@@ -1,4 +1,4 @@
-From e46d9dd8f6701270b5243348ffb4b8c3430c4229 Mon Sep 17 00:00:00 2001
+From 4d6597584b90d2bc17b440dcdeff29cdc934a6dd Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <[email protected]>
 Date: Mon, 8 Apr 2019 16:32:17 -0500
 Subject: [PATCH 1/7] Fix sysroot detection for linux
@@ -8,10 +8,10 @@ Subject: [PATCH 1/7] Fix sysroot detection for linux
  1 file changed, 16 insertions(+), 4 deletions(-)
 
 diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index c6fb290ffdb..b817620a8bb 100644
+index 1ba222bf83b..ee361924b9e 100644
 --- a/clang/lib/Driver/ToolChains/Linux.cpp
 +++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -370,18 +370,30 @@ std::string Linux::computeSysRoot() const {
+@@ -394,18 +394,30 @@ std::string Linux::computeSysRoot() const {
      return std::string();
    }