Unverified Commit c963c4da authored by John Ericson's avatar John Ericson Committed by GitHub
Browse files

Merge pull request #315904 from NixOS/backport-315790-to-release-24.05 

[Backport release-24.05] llvmPackages_18.{clang,libcxx}: Revert redundant openbsd patches
parents d13f2109 72779eb9

pkgs/development/compilers/llvm/18/default.nix

+2 −12
Original line number Diff line number Diff line 
{ lowPrio, newScope, pkgs, lib, stdenv, cmake, ninja

, preLibcCrossHeaders

, libxml2, python3, fetchFromGitHub, fetchpatch, substituteAll, overrideCC, wrapCCWith, wrapBintoolsWith

, libxml2, python3, fetchFromGitHub, substituteAll, overrideCC, wrapCCWith, wrapBintoolsWith

, buildLlvmTools # tools, but from the previous stage, for cross

, targetLlvmLibraries # libraries, but from the next stage, for cross

, targetLlvm
@@ -146,11 +146,6 @@ in let 
        # https://reviews.llvm.org/D51899

        ./clang/gnu-install-dirs.patch

        ../common/clang/add-nostdlibinc-flag.patch

        (fetchpatch {

          url = "https://github.com/llvm/llvm-project/commit/48c1364200b5649dda2f9ccbe382b0bd908b99de.patch";

          sha256 = "sha256-beSydky0P/06YDLk0GJDtcREpMcU2FspxuYU6EnQGfA=";

          stripLen = 1;

        })

        (substituteAll {

          src = ../common/clang/clang-at-least-16-LLVMgold-path.patch;

          libllvmLibdir = "${tools.libllvm.lib}/lib";
@@ -396,12 +391,7 @@ in let 
    # so: we use the clang from this LLVM package set instead of the regular

    # stdenv's compiler.

    libcxx = callPackage ../common/libcxx {

      patches = [

        (fetchpatch {

          url = "https://github.com/llvm/llvm-project/commit/1118c2e05e67a36ed8ca250524525cdb66a55256.patch";

          sha256 = "sha256-2lDO9UsglvYAxDG3/iTXqGVHn1Hq3O7wtkCUb9I/Buc=";

        })

      ] ++ lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [

      patches = lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [

        # https://github.com/llvm/llvm-project/issues/64226

        ./libcxx/0001-darwin-10.12-mbstate_t-fix.patch

      ];