chromium{Beta,Dev}: Switch to LLVM 14

This fixes the following build error:
[24751/48400] ACTION //components/url_formatter/spoof_checks/top_domains:generate_top_domain_list_variables_file(//build/toolchain/linux/unbundle:default)d_tmp/browser_command.mojom-webui.js.mojom-webui.jsui.js
FAILED: gen/components/url_formatter/spoof_checks/top_domains/top500-domains-inc.cc
python3 ../../build/gn_run_binary.py make_top_domain_list_variables ../../components/url_formatter/spoof_checks/top_domains/domains.list top500_domains gen/components/url_formatter/spoof_checks/top_domains/top500-domains-inc.cc
make_top_domain_list_variables failed with exit code -4

The "make_top_domain_list_variables" program fails due to a SIGILL error
(illegal instruction). See:
- https://bugs.chromium.org/p/chromium/issues/detail?id=1273966
  - https://reviews.llvm.org/D115015
  - https://bugs.chromium.org/p/chromium/issues/detail?id=1269407

(cherry picked from commit c0952b6478)
This commit is contained in:
Michael Weiss
2022-02-18 21:28:37 +01:00
parent a23a1843f9
commit ed2b047dfe

View File

@@ -1,5 +1,5 @@
{ newScope, config, stdenv, fetchurl, makeWrapper
, llvmPackages_13, ed, gnugrep, coreutils, xdg-utils
, llvmPackages_13, llvmPackages_14, ed, gnugrep, coreutils, xdg-utils
, glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit
, libva, pipewire, wayland
, gcc, nspr, nss, runCommand
@@ -54,6 +54,9 @@ let
inherit (upstream-info.deps.gn) url rev sha256;
};
});
} // lib.optionalAttrs (chromiumVersionAtLeast "99") rec {
llvmPackages = llvmPackages_14;
stdenv = llvmPackages_14.stdenv;
});
browser = callPackage ./browser.nix {