tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
[llvm-19] rust: use LLVM 19 (#354149)
Emily
1 year ago
d72a2893
8c25817c
+11
-11
2 changed files
expand all
collapse all
unified
split
pkgs
development
compilers
rust
1_82.nix
top-level
all-packages.nix
+10
-10
pkgs/development/compilers/rust/1_82.nix
···
24
pkgsTargetTarget,
25
makeRustPlatform,
26
wrapRustcWith,
27
-
llvmPackages_18,
28
-
llvm_18,
29
wrapCCWith,
30
overrideCC,
31
fetchpatch,
···
33
let
34
llvmSharedFor =
35
pkgSet:
36
-
pkgSet.llvmPackages_18.libllvm.override (
37
{
38
enableSharedLibraries = true;
39
}
···
41
# Force LLVM to compile using clang + LLVM libs when targeting pkgsLLVM
42
stdenv = pkgSet.stdenv.override {
43
allowedRequisites = null;
44
-
cc = pkgSet.pkgsBuildHost.llvmPackages_18.clangUseLLVM;
45
};
46
}
47
);
···
68
bootBintools ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintools,
69
}:
70
let
71
-
llvmPackages = llvmPackages_18;
72
73
setStdenv =
74
pkg:
75
pkg.override {
76
stdenv = stdenv.override {
77
allowedRequisites = null;
78
-
cc = pkgsBuildHost.llvmPackages_18.clangUseLLVM;
79
};
80
};
81
in
···
88
libcxx = llvmPackages.libcxx.override {
89
stdenv = stdenv.override {
90
allowedRequisites = null;
91
-
cc = pkgsBuildHost.llvmPackages_18.clangNoLibcxx;
92
hostPlatform = stdenv.hostPlatform // {
93
useLLVM = !stdenv.hostPlatform.isDarwin;
94
};
···
102
}
103
) { }
104
else
105
-
llvmPackages_18;
106
107
# Note: the version MUST be the same version that we are building. Upstream
108
# ensures that each released compiler can compile itself:
···
139
140
(
141
builtins.removeAttrs args [
142
-
"llvmPackages_18"
143
-
"llvm_18"
144
"wrapCCWith"
145
"overrideCC"
146
"fetchpatch"
···
24
pkgsTargetTarget,
25
makeRustPlatform,
26
wrapRustcWith,
27
+
llvmPackages_19,
28
+
llvm_19,
29
wrapCCWith,
30
overrideCC,
31
fetchpatch,
···
33
let
34
llvmSharedFor =
35
pkgSet:
36
+
pkgSet.llvmPackages_19.libllvm.override (
37
{
38
enableSharedLibraries = true;
39
}
···
41
# Force LLVM to compile using clang + LLVM libs when targeting pkgsLLVM
42
stdenv = pkgSet.stdenv.override {
43
allowedRequisites = null;
44
+
cc = pkgSet.pkgsBuildHost.llvmPackages_19.clangUseLLVM;
45
};
46
}
47
);
···
68
bootBintools ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintools,
69
}:
70
let
71
+
llvmPackages = llvmPackages_19;
72
73
setStdenv =
74
pkg:
75
pkg.override {
76
stdenv = stdenv.override {
77
allowedRequisites = null;
78
+
cc = pkgsBuildHost.llvmPackages_19.clangUseLLVM;
79
};
80
};
81
in
···
88
libcxx = llvmPackages.libcxx.override {
89
stdenv = stdenv.override {
90
allowedRequisites = null;
91
+
cc = pkgsBuildHost.llvmPackages_19.clangNoLibcxx;
92
hostPlatform = stdenv.hostPlatform // {
93
useLLVM = !stdenv.hostPlatform.isDarwin;
94
};
···
102
}
103
) { }
104
else
105
+
llvmPackages_19;
106
107
# Note: the version MUST be the same version that we are building. Upstream
108
# ensures that each released compiler can compile itself:
···
139
140
(
141
builtins.removeAttrs args [
142
+
"llvmPackages_19"
143
+
"llvm_19"
144
"wrapCCWith"
145
"overrideCC"
146
"fetchpatch"
+1
-1
pkgs/top-level/all-packages.nix
···
6912
6913
rust_1_82 = callPackage ../development/compilers/rust/1_82.nix {
6914
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
6915
-
llvm_18 = llvmPackages_18.libllvm;
6916
};
6917
rust = rust_1_82;
6918
···
6912
6913
rust_1_82 = callPackage ../development/compilers/rust/1_82.nix {
6914
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
6915
+
llvm_19 = llvmPackages_19.libllvm;
6916
};
6917
rust = rust_1_82;
6918