Merge pull request #274863 from yu-re-ka/chromium-llvm17
chromium: use llvm 17
This commit is contained in:
commit
9c56ece502
@ -246,17 +246,9 @@ let
|
||||
# (we currently package 1.26 in Nixpkgs while Chromium bundles 1.21):
|
||||
# Source: https://bugs.chromium.org/p/angleproject/issues/detail?id=7582#c1
|
||||
./patches/angle-wayland-include-protocol.patch
|
||||
] ++ lib.optionals (!chromiumVersionAtLeast "120") [
|
||||
# We need to revert this patch to build M114+ with LLVM 16:
|
||||
(githubPatch {
|
||||
# Reland [clang] Disable autoupgrading debug info in ThinLTO builds
|
||||
commit = "54969766fd2029c506befc46e9ce14d67c7ed02a";
|
||||
hash = "sha256-Vryjg8kyn3cxWg3PmSwYRG6zrHOqYWBMSdEMGiaPg6M=";
|
||||
revert = true;
|
||||
})
|
||||
] ++ lib.optionals (chromiumVersionAtLeast "120") [
|
||||
# We need to revert this patch to build M120+ with LLVM 16:
|
||||
./patches/chromium-120-llvm-16.patch
|
||||
# We need to revert this patch to build M120+ with LLVM 17:
|
||||
./patches/chromium-120-llvm-17.patch
|
||||
] ++ lib.optionals (!chromiumVersionAtLeast "119.0.6024.0") [
|
||||
# Fix build with at-spi2-core ≥ 2.49
|
||||
# This version is still needed for electron.
|
||||
|
@ -26,7 +26,7 @@ let
|
||||
# Sometimes we access `llvmPackages` via `pkgs`, and other times
|
||||
# via `pkgsFooBar`, so a string (attrname) is the only way to have
|
||||
# a single point of control over the LLVM version used.
|
||||
llvmPackages_attrName = "llvmPackages_16";
|
||||
llvmPackages_attrName = "llvmPackages_17";
|
||||
stdenv = pkgs.${llvmPackages_attrName}.stdenv;
|
||||
|
||||
# Helper functions for changes that depend on specific versions:
|
||||
|
@ -27,17 +27,3 @@ index de1cd6e..bb5700b 100644
|
||||
# TODO(crbug.com/1235145): Investigate why/if this should be needed.
|
||||
if (is_win) {
|
||||
cflags += [ "/clang:-ffp-contract=off" ]
|
||||
@@ -800,13 +782,6 @@ config("compiler") {
|
||||
if (is_apple) {
|
||||
ldflags += [ "-Wcrl,object_path_lto" ]
|
||||
}
|
||||
- if (!is_chromeos) {
|
||||
- # TODO(https://crbug.com/972449): turn on for ChromeOS when that
|
||||
- # toolchain has this flag.
|
||||
- # We only use one version of LLVM within a build so there's no need to
|
||||
- # upgrade debug info, which can be expensive since it runs the verifier.
|
||||
- ldflags += [ "-Wl,-mllvm,-disable-auto-upgrade-debug-info" ]
|
||||
- }
|
||||
}
|
||||
|
||||
# TODO(https://crbug.com/1211155): investigate why this isn't effective on
|
Loading…
Reference in New Issue
Block a user