diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-12 18:01:46 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-12 18:01:46 +0000 |
commit | 6b78f024b2edf7110b60f66060cb74579b362afb (patch) | |
tree | 5fa2674e2363466d9fcc056710082a4a00a1ab29 /pkgs/development/compilers/llvm/git/default.nix | |
parent | a2569dbec0e771c361f23d413b1ace61c3a7cc67 (diff) | |
parent | 14feac318eefa31d936d9b6a2aacb1928899abfe (diff) | |
download | nixlib-6b78f024b2edf7110b60f66060cb74579b362afb.tar nixlib-6b78f024b2edf7110b60f66060cb74579b362afb.tar.gz nixlib-6b78f024b2edf7110b60f66060cb74579b362afb.tar.bz2 nixlib-6b78f024b2edf7110b60f66060cb74579b362afb.tar.lz nixlib-6b78f024b2edf7110b60f66060cb74579b362afb.tar.xz nixlib-6b78f024b2edf7110b60f66060cb74579b362afb.tar.zst nixlib-6b78f024b2edf7110b60f66060cb74579b362afb.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/compilers/llvm/git/default.nix')
-rw-r--r-- | pkgs/development/compilers/llvm/git/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index eee140f7b7e2..6ebb2ea9fcc2 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -1,5 +1,5 @@ -{ lowPrio, newScope, pkgs, lib, stdenv, stdenvNoCC, cmake, ninja -, gccForLibs, preLibcCrossHeaders +{ lowPrio, newScope, pkgs, lib, stdenv, cmake, ninja +, preLibcCrossHeaders , libxml2, python3, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -272,6 +272,12 @@ in let nixSupport.cc-cflags = [ "-fno-exceptions" ]; }); + # Has to be in tools despite mostly being a library, + # because we use a native helper executable from a + # non-cross build in cross builds. + libclc = callPackage ../common/libclc.nix { + inherit buildLlvmTools; + }; }); libraries = lib.makeExtensible (libraries: let |