clang 16.0.0.rc1

.ci_support/linux_64_variantdefault.yaml

@@ -7,14 +7,11 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '10'
+- '11'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libclang_soversion:
 - '13'
-pin_run_as_build:
-  zlib:
-    max_pin: x.x
 target_platform:
 - linux-64
 variant:

.ci_support/linux_aarch64_variantdefault.yaml

@@ -11,14 +11,11 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '10'
+- '11'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libclang_soversion:
 - '13'
-pin_run_as_build:
-  zlib:
-    max_pin: x.x
 target_platform:
 - linux-aarch64
 variant:

.ci_support/linux_ppc64le_variantdefault.yaml

@@ -7,14 +7,11 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '10'
+- '11'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libclang_soversion:
 - '13'
-pin_run_as_build:
-  zlib:
-    max_pin: x.x
 target_platform:
 - linux-ppc64le
 variant:

.ci_support/win_64_.yaml

@@ -6,9 +6,6 @@ cxx_compiler:
 - vs2019
 libclang_soversion:
 - '13'
-pin_run_as_build:
-  zlib:
-    max_pin: x.x
 target_platform:
 - win-64
 variant:

recipe/meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "15.0.0.rc3" %}
+{% set version = "16.0.0.rc1" %}
 {% set major_version = version.split(".")[0] %}
 {% set build_number = 0 %}
 
@@ -17,7 +17,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: 36b3c3cb2baa598192f11a1e00634401a35447b83a2bc12289bb2dcc3cc73520
+    sha256: 8399db003b223ce33e3d7a5ee9df8dc3574cedffa5d9be4783660643f8402900
     patches:
       - patches/0001-Find-conda-gcc-installation.patch
       - patches/0002-Fix-sysroot-detection-for-linux.patch
@@ -29,6 +29,7 @@ source:
       # Only enable it for TARGET_OS_OSX.
       - patches/0007-Only-error-on-undefined-TARGET_OS_OSX.patch  # [osx and x86_64]
       - patches/0008-set-libclang-SOVERSION-unconditionally.patch
+      # check out git history before LLVM 16 for these patches
       # - patches/amd-roc-2.7.0.diff   # [variant != "hcc"]
       # - patches/amd-roc-hcc-2.7.0.diff  # [variant == "hcc"]
     # name folder for easier deletion; we do the equivalent of downloading
@@ -152,7 +153,7 @@ outputs:
       track_features:
         - hcc          # [variant=="hcc"]
       string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }}
-      run_exports:                                                                # [unix]
+      run_exports:   # [unix]
         - {{ pin_subpackage("libclang-cpp" + minor_aware_ext, max_pin="x.x") }}   # [unix]
     requirements:
       build:
@@ -298,8 +299,8 @@ outputs:
         - test -f "$PREFIX/lib/libclang-cpp.so.{{ minor_aware_ext }}"     # [linux]
         - test ! -f "$PREFIX/lib/libclang-cpp.dylib"                      # [osx]
         - test -f "$PREFIX/lib/libclang-cpp.{{ minor_aware_ext }}.dylib"  # [osx]
-        - test -f "$PREFIX/lib/clang/{{ '.'.join(version.split('.')[:3]) }}/include/stdatomic.h"                    # [unix]
-        - if not exist %LIBRARY_LIB%\\clang\\{{ '.'.join(version.split('.')[:3]) }}\\include\\stdatomic.h exit 1    # [win]
+        - test -f "$PREFIX/lib/clang/{{ version.split('.')[0] }}/include/stdatomic.h"                    # [unix]
+        - if not exist %LIBRARY_LIB%\\clang\\{{ version.split('.')[0] }}\\include\\stdatomic.h exit 1    # [win]
 
   - name: clang
     script: install_clang_symlinks.sh  # [unix]
@@ -489,6 +490,7 @@ about:
 
 extra:
   recipe-maintainers:
+    - JohanMabille
     - inducer
     - isuruf
     - jakirkham

recipe/patches/0001-Find-conda-gcc-installation.patch

@@ -1,4 +1,4 @@
-From d5bac3f57633587b3d055ced43cd3fc6d6ebd162 Mon Sep 17 00:00:00 2001
+From 19132c83dc48e903a5d989f2177d49007f31ea4d Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Mon, 8 Apr 2019 16:20:03 -0500
 Subject: [PATCH 1/8] Find conda gcc installation
@@ -8,10 +8,10 @@ Subject: [PATCH 1/8] Find conda gcc installation
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
-index f203cae1d329..c750e6844ca0 100644
+index 4f23403166..cd3c03efdd 100644
 --- a/clang/lib/Driver/ToolChains/Gnu.cpp
 +++ b/clang/lib/Driver/ToolChains/Gnu.cpp
-@@ -2188,7 +2188,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
+@@ -2218,7 +2218,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
    static const char *const AArch64LibDirs[] = {"/lib64", "/lib"};
    static const char *const AArch64Triples[] = {
        "aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-redhat-linux",
@@ -20,7 +20,7 @@ index f203cae1d329..c750e6844ca0 100644
    static const char *const AArch64beLibDirs[] = {"/lib"};
    static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu",
                                                   "aarch64_be-linux-gnu"};
-@@ -2218,7 +2218,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
+@@ -2248,7 +2248,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
        "x86_64-redhat-linux",    "x86_64-suse-linux",
        "x86_64-manbo-linux-gnu", "x86_64-linux-gnu",
        "x86_64-slackware-linux", "x86_64-unknown-linux",
@@ -30,7 +30,7 @@ index f203cae1d329..c750e6844ca0 100644
    static const char *const X32Triples[] = {"x86_64-linux-gnux32",
                                             "x86_64-pc-linux-gnux32"};
    static const char *const X32LibDirs[] = {"/libx32", "/lib"};
-@@ -2281,7 +2282,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
+@@ -2315,7 +2316,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
    static const char *const PPC64LETriples[] = {
        "powerpc64le-linux-gnu", "powerpc64le-unknown-linux-gnu",
        "powerpc64le-none-linux-gnu", "powerpc64le-suse-linux",
@@ -40,5 +40,5 @@ index f203cae1d329..c750e6844ca0 100644
    static const char *const RISCV32LibDirs[] = {"/lib32", "/lib"};
    static const char *const RISCV32Triples[] = {"riscv32-unknown-linux-gnu",
 -- 
-2.37.0.windows.1
+2.38.1.windows.1
 

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

@@ -1,4 +1,4 @@
-From b74e506cc8724c5a5a8f33ab3dcb135f850721e2 Mon Sep 17 00:00:00 2001
+From c66404de3a5fb2ae88e836e995ebcf13cd38f1e6 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Mon, 8 Apr 2019 16:32:17 -0500
 Subject: [PATCH 2/8] Fix sysroot detection for linux
@@ -8,10 +8,10 @@ Subject: [PATCH 2/8] Fix sysroot detection for linux
  1 file changed, 8 insertions(+)
 
 diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index ceb1a982c3a4..d6f62ec0acd6 100644
+index c6fb290ffd..fcacc1dcbd 100644
 --- a/clang/lib/Driver/ToolChains/Linux.cpp
 +++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -394,6 +394,14 @@ std::string Linux::computeSysRoot() const {
+@@ -388,6 +388,14 @@ std::string Linux::computeSysRoot() const {
    if (getVFS().exists(Path))
      return Path;
 
@@ -27,5 +27,5 @@ index ceb1a982c3a4..d6f62ec0acd6 100644
 
    if (getVFS().exists(Path))
 -- 
-2.37.0.windows.1
+2.38.1.windows.1
 

recipe/patches/0003-clang-add-conda-specific-env-var-CONDA_BUILD_SYSROOT.patch

@@ -1,4 +1,4 @@
-From e1712797c251d63724934dbb790fee7af541c72d Mon Sep 17 00:00:00 2001
+From c2c32b2cd1c88f88d150ff502d5f1e0fd4d99512 Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Sat, 25 Aug 2018 09:20:04 -0500
 Subject: [PATCH 3/8] clang: add conda specific env var CONDA_BUILD_SYSROOT
@@ -9,10 +9,10 @@ Subject: [PATCH 3/8] clang: add conda specific env var CONDA_BUILD_SYSROOT
  2 files changed, 12 insertions(+), 3 deletions(-)
 
 diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
-index 3f29afd35971..94b4c6459478 100644
+index 661d9977fb..f5a75515ed 100644
 --- a/clang/lib/Driver/Driver.cpp
 +++ b/clang/lib/Driver/Driver.cpp
-@@ -1270,8 +1270,13 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
+@@ -1327,8 +1327,13 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
        CompilerPath = Split.second;
      }
    }
@@ -29,7 +29,7 @@ index 3f29afd35971..94b4c6459478 100644
      DyldPrefix = A->getValue();
 
 diff --git a/clang/lib/Lex/InitHeaderSearch.cpp b/clang/lib/Lex/InitHeaderSearch.cpp
-index 158b5667151f..a3ab5f8f18b2 100644
+index d446556571..8354362d1f 100644
 --- a/clang/lib/Lex/InitHeaderSearch.cpp
 +++ b/clang/lib/Lex/InitHeaderSearch.cpp
 @@ -25,6 +25,7 @@
@@ -38,20 +38,20 @@ index 158b5667151f..a3ab5f8f18b2 100644
  #include "llvm/Support/Path.h"
 +#include "llvm/Support/Process.h"
  #include "llvm/Support/raw_ostream.h"
+ #include <optional>
 
- using namespace clang;
-@@ -249,7 +250,10 @@ void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple,
-       LLVM_FALLTHROUGH;
+@@ -243,7 +244,10 @@ void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple,
+       [[fallthrough]];
      default:
        // FIXME: temporary hack: hard-coded paths.
 -      AddPath("/usr/local/include", System, false);
 +      Optional<std::string> CondaBuildSysrootValue =
 +              llvm::sys::Process::GetEnv("CONDA_BUILD_SYSROOT");
-+      if (!CondaBuildSysrootValue.hasValue())
++      if (!CondaBuildSysrootValue.has_value())
 +        AddPath("/usr/local/include", System, false);
        break;
      }
    }
 -- 
-2.37.0.windows.1
+2.38.1.windows.1
 

recipe/patches/0004-Fix-normalizeProgramName-s-handling-of-dots-outside-.patch

@@ -1,4 +1,4 @@
-From 71557667efee4bbead3b681312a0dacda2a581b7 Mon Sep 17 00:00:00 2001
+From d4dffafebae289d10cffcdd8cb41956d53e2fadc Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Wed, 30 Aug 2017 20:01:49 +0100
 Subject: [PATCH 4/8] Fix normalizeProgramName()'s handling of dots outside of
@@ -18,18 +18,18 @@ x86_64-apple-darwin13.4
  1 file changed, 22 insertions(+), 1 deletion(-)
 
 diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
-index 7a4319ea680f..97b1a8c6341e 100644
+index bc70205a6c..3a7948509a 100644
 --- a/clang/lib/Driver/ToolChain.cpp
 +++ b/clang/lib/Driver/ToolChain.cpp
-@@ -50,6 +50,7 @@ using namespace driver;
+@@ -51,6 +51,7 @@ using namespace driver;
  using namespace tools;
  using namespace llvm;
  using namespace llvm::opt;
 +using namespace llvm::sys::path;
 
  static llvm::opt::Arg *GetRTTIArgument(const ArgList &Args) {
    return Args.getLastArg(options::OPT_mkernel, options::OPT_fapple_kext,
-@@ -195,10 +196,30 @@ static const DriverSuffix *FindDriverSuffix(StringRef ProgName, size_t &Pos) {
+@@ -223,10 +224,30 @@ static const DriverSuffix *FindDriverSuffix(StringRef ProgName, size_t &Pos) {
    return nullptr;
  }
 
@@ -56,11 +56,11 @@ index 7a4319ea680f..97b1a8c6341e 100644
  /// Normalize the program name from argv[0] by stripping the file extension if
  /// present and lower-casing the string on Windows.
  static std::string normalizeProgramName(llvm::StringRef Argv0) {
--  std::string ProgName = std::string(llvm::sys::path::stem(Argv0));
+-  std::string ProgName = std::string(llvm::sys::path::filename(Argv0));
 +  std::string ProgName = std::string(program_name_stem(Argv0));
    if (is_style_windows(llvm::sys::path::Style::native)) {
      // Transform to lowercase for case insensitive file systems.
      std::transform(ProgName.begin(), ProgName.end(), ProgName.begin(),
 -- 
-2.37.0.windows.1
+2.38.1.windows.1