From fbb1417d0b8c642a19868ab5f89c03ed8ba09b8d Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Fri, 16 Sep 2022 11:49:53 -0400 Subject: just compile please --- .../chromium/files/chromium-107-compiler.patch | 52 +++++++++++++++++++--- 1 file changed, 47 insertions(+), 5 deletions(-) (limited to 'www-client/chromium/files') diff --git a/www-client/chromium/files/chromium-107-compiler.patch b/www-client/chromium/files/chromium-107-compiler.patch index 1d059c4..279341e 100644 --- a/www-client/chromium/files/chromium-107-compiler.patch +++ b/www-client/chromium/files/chromium-107-compiler.patch @@ -1,5 +1,11 @@ +commit 82c9b35823a9dd186f2635f35a2e50f291732f69 +Author: Chris Xiong +Date: Fri Sep 16 11:39:08 2022 -0400 + + compiler take 2 + diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 665b42c3b..26b141903 100644 +index 665b42c3b..fb3091665 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -274,9 +274,7 @@ config("compiler") { @@ -98,16 +104,52 @@ index 665b42c3b..26b141903 100644 # Tells the compiler not to use absolute paths when passing the default # paths to the tools it invokes. We don't want this because we don't # really need it and it can mess up the goma cache entries. -@@ -1310,7 +1236,8 @@ config("compiler_deterministic") { +@@ -1310,25 +1236,26 @@ config("compiler_deterministic") { } } -config("clang_revision") { +- if (is_clang && clang_base_path == default_clang_base_path) { +- update_args = [ +- "--print-revision", +- "--verify-version=$clang_version", +- ] +- if (llvm_force_head_revision) { +- update_args += [ "--llvm-force-head-revision" ] +- } +- clang_revision = exec_script("//tools/clang/scripts/update.py", +- update_args, +- "trim string") +- +- # This is here so that all files get recompiled after a clang roll and +- # when turning clang on or off. (defines are passed via the command line, +- # and build system rebuild things when their commandline changes). Nothing +- # should ever read this define. +- defines = [ "CR_CLANG_REVISION=\"$clang_revision\"" ] +- } +config("clang_revision") { } +config("xclang_revision") { - if (is_clang && clang_base_path == default_clang_base_path) { - update_args = [ - "--print-revision", ++# if (is_clang && clang_base_path == default_clang_base_path) { ++# update_args = [ ++# "--print-revision", ++# "--verify-version=$clang_version", ++# ] ++# if (llvm_force_head_revision) { ++# update_args += [ "--llvm-force-head-revision" ] ++# } ++# clang_revision = exec_script("//tools/clang/scripts/update.py", ++# update_args, ++# "trim string") ++# ++# # This is here so that all files get recompiled after a clang roll and ++# # when turning clang on or off. (defines are passed via the command line, ++# # and build system rebuild things when their commandline changes). Nothing ++# # should ever read this define. ++# defines = [ "CR_CLANG_REVISION=\"$clang_revision\"" ] ++# } + } + + config("rustc_revision") { @@ -1616,7 +1543,7 @@ config("chromium_code") { defines = [ "_HAS_NODISCARD" ] } -- cgit v1.2.3