|
|
|
@ -1,5 +1,5 @@ |
|
|
|
|
{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook |
|
|
|
|
, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith |
|
|
|
|
, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith |
|
|
|
|
, buildLlvmTools # tools, but from the previous stage, for cross |
|
|
|
|
, targetLlvmLibraries # libraries, but from the next stage, for cross |
|
|
|
|
}: |
|
|
|
@ -16,7 +16,7 @@ let |
|
|
|
|
clang-tools-extra_src = fetch "clang-tools-extra" "1qf3097bc5ia8p6cpmbx985rjr3yaah5s8fc0nv7pw742yv7jw8q"; |
|
|
|
|
|
|
|
|
|
tools = stdenv.lib.makeExtensible (tools: let |
|
|
|
|
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); |
|
|
|
|
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); |
|
|
|
|
mkExtraBuildCommands = cc: '' |
|
|
|
|
rsrc="$out/resource-root" |
|
|
|
|
mkdir "$rsrc" |
|
|
|
@ -42,12 +42,12 @@ let |
|
|
|
|
|
|
|
|
|
llvm-manpages = lowPrio (tools.llvm.override { |
|
|
|
|
enableManpages = true; |
|
|
|
|
python = pkgs.python; # don't use python-boot |
|
|
|
|
python3 = pkgs.python3; # don't use python-boot |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
clang-manpages = lowPrio (tools.clang-unwrapped.override { |
|
|
|
|
enableManpages = true; |
|
|
|
|
python = pkgs.python; # don't use python-boot |
|
|
|
|
python3 = pkgs.python3; # don't use python-boot |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
libclang = tools.clang-unwrapped.lib; |
|
|
|
@ -162,7 +162,7 @@ let |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
libraries = stdenv.lib.makeExtensible (libraries: let |
|
|
|
|
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); |
|
|
|
|
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); |
|
|
|
|
in { |
|
|
|
|
|
|
|
|
|
compiler-rt = callPackage ./compiler-rt.nix ({} // |
|
|
|
|