nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-03 02:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

llvmPackages.clang: Fix special-case for OpenBSD to be less special

Browse Source
This commit is contained in:
John Ericson 2024-05-12 01:07:43 -04:00
parent d9c9da5d65
commit 222a29eb53
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/compilers/llvm/18/default.nix
View File

@ -1,6 +1,6 @@
{ lowPrio, newScope, pkgs, lib, stdenv, cmake, ninja { lowPrio, newScope, pkgs, lib, stdenv, cmake, ninja
, preLibcCrossHeaders , preLibcCrossHeaders
, libxml2, python3, fetchFromGitHub, substituteAll, overrideCC, wrapCCWith, wrapBintoolsWith , libxml2, python3, fetchFromGitHub, fetchpatch, substituteAll, overrideCC, wrapCCWith, wrapBintoolsWith
, buildLlvmTools # tools, but from the previous stage, for cross , buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross
, targetLlvm , targetLlvm
@ -146,6 +146,11 @@ in let
# https://reviews.llvm.org/D51899 # https://reviews.llvm.org/D51899
./clang/gnu-install-dirs.patch ./clang/gnu-install-dirs.patch
../common/clang/add-nostdlibinc-flag.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 { (substituteAll {
src = ../common/clang/clang-at-least-16-LLVMgold-path.patch; src = ../common/clang/clang-at-least-16-LLVMgold-path.patch;
libllvmLibdir = "${tools.libllvm.lib}/lib"; libllvmLibdir = "${tools.libllvm.lib}/lib";