diff options
author | Reno Dakota <170618376+paparodeo@users.noreply.github.com> | 2024-05-30 04:56:47 +0000 |
---|---|---|
committer | Reno Dakota <170618376+paparodeo@users.noreply.github.com> | 2024-05-30 05:07:41 +0000 |
commit | 30d42ba5694da36ffab9f68c12e4468e1af8190d (patch) | |
tree | 87a4b608d3851d61bbaaf50eae744bc323df9dd2 /pkgs/development | |
parent | 8110970af91e4fc0c44c0addba58c72770d60c95 (diff) |
Revert "llvmPackages.clang: Fix special-case for OpenBSD to be less special"
This reverts commit 222a29eb534527fc82d96cd681242c6e788cabc1.
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/compilers/llvm/18/default.nix | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/development/compilers/llvm/18/default.nix b/pkgs/development/compilers/llvm/18/default.nix index 0deba2954aaa2..5b2b09bbb6ec2 100644 --- a/pkgs/development/compilers/llvm/18/default.nix +++ b/pkgs/development/compilers/llvm/18/default.nix @@ -1,6 +1,6 @@ { 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"; |