gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

llvmPackages_git: 20.0.0-git-2024-09-16 -> 20.0.0-git-2024-09-22 (#343867)

Browse Source
This commit is contained in:
Tristan Ross
2024-09-29 07:07:38 -07:00
committed by GitHub
parent 939a71cf40 d55298086a
commit 5b68f9c5f4
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/llvm/common/clang/default.nix
+5 -2
View File
@@ -72,7 +72,8 @@ let
"-DCLANG_PSEUDO_GEN=${buildLlvmTools.libclang.dev}/bin/clang-pseudo-gen"
]) ++ lib.optionals (stdenv.targetPlatform.useLLVM or false) [
"-DCLANG_DEFAULT_CXX_STDLIB=ON"
] ++ devExtraCmakeFlags;
] ++ lib.optional (lib.versionAtLeast release_version "20") "-DLLVM_DIR=${libllvm.dev}/lib/cmake/llvm"
++ devExtraCmakeFlags;
postPatch = ''
# Make sure clang passes the correct location of libLTO to ld64
@@ -132,8 +133,10 @@ let
mkdir -p $dev/bin
'' + (if lib.versionOlder release_version "15" then ''
cp bin/clang-tblgen $dev/bin
'' else ''
'' else if lib.versionOlder release_version "20" then ''
cp bin/{clang-tblgen,clang-tidy-confusable-chars-gen,clang-pseudo-gen} $dev/bin
'' else ''
cp bin/{clang-tblgen,clang-tidy-confusable-chars-gen} $dev/bin
'');
passthru = {
pkgs/development/compilers/llvm/common/default.nix
+12 -1
View File
@@ -483,7 +483,18 @@ let
stripLen = 1;
hash = "sha256-fqw5gTSEOGs3kAguR4tINFG7Xja1RAje+q67HJt2nGg=";
})
];
]
++
lib.optional (lib.versions.major metadata.release_version == "20")
# Fix for vt_gen, remove during next git bump
# https://github.com/llvm/llvm-project/pull/109817
(
fetchpatch {
url = "https://github.com/llvm/llvm-project/commit/cace9869775a185793122f845d81a5ff46f15728.patch";
stripLen = 1;
hash = "sha256-lt1iQfNIc3ot1+6J7d7dbqULwT0MyLIwR2EZB7RfPp4=";
}
);
pollyPatches =
[ (metadata.getVersionFile "llvm/gnu-install-dirs-polly.patch") ]
++ lib.optional (lib.versionAtLeast metadata.release_version "15")
pkgs/development/compilers/llvm/default.nix
+3 -3
View File
@@ -30,9 +30,9 @@ let
"18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
"19.1.0-rc3".officialRelease.sha256 = "sha256-SRonSpXt1pH6Xk+rQZk9mrfMdvYIvOImwUfMUu3sBgs=";
"20.0.0-git".gitRelease = {
rev = "48498ec7a4ded9f1bf813051abdc54c3e5b66fa7";
rev-version = "20.0.0-unstable-2024-09-16";
sha256 = "sha256-kybEr4T6vA4F9wtWdFf0QagVYU3tUvaXiSzPsxBkVUI=";
rev = "81c3499531c3fe03827bd8bc890e3a16db9e4c3c";
rev-version = "20.0.0-unstable-2024-09-22";
sha256 = "sha256-mQZhQ0qfWs4NmL62H3wNwG28iARUasWh9m8zMCNkRis=";
};
} // llvmVersions;