build: move libcc patches to electron repo (#14104)
In the GN build, libchromiumcontent is no longer a distinct library, but merely a container for a set of scripts and patches. Maintaining those patches in a separate repository is tedious and error-prone, so merge them into the main repo. Once this is merged and GN is the default way to build Electron, the libchromiumcontent repository can be archived.
This commit is contained in:
parent
9e85bdb02c
commit
76c5f5cc8a
147 changed files with 86931 additions and 6 deletions
45
patches/common/chromium/windows_cc_wrapper.patch
Normal file
45
patches/common/chromium/windows_cc_wrapper.patch
Normal file
|
@ -0,0 +1,45 @@
|
|||
diff --git a/build/toolchain/win/BUILD.gn b/build/toolchain/win/BUILD.gn
|
||||
index a526d47e7786..946df3cd513c 100644
|
||||
--- a/build/toolchain/win/BUILD.gn
|
||||
+++ b/build/toolchain/win/BUILD.gn
|
||||
@@ -6,6 +6,7 @@ import("//build/config/clang/clang.gni")
|
||||
import("//build/config/compiler/compiler.gni")
|
||||
import("//build/config/sanitizers/sanitizers.gni")
|
||||
import("//build/config/win/visual_studio_version.gni")
|
||||
+import("//build/toolchain/cc_wrapper.gni")
|
||||
import("//build/toolchain/clang_static_analyzer.gni")
|
||||
import("//build/toolchain/goma.gni")
|
||||
import("//build/toolchain/toolchain.gni")
|
||||
@@ -28,8 +29,14 @@ if (use_goma) {
|
||||
} else {
|
||||
goma_prefix = "$goma_dir/gomacc "
|
||||
}
|
||||
+ clang_prefix = goma_prefix
|
||||
} else {
|
||||
goma_prefix = ""
|
||||
+ if (cc_wrapper != "") {
|
||||
+ clang_prefix = cc_wrapper + " "
|
||||
+ } else {
|
||||
+ clang_prefix = ""
|
||||
+ }
|
||||
}
|
||||
|
||||
if (disable_goma) {
|
||||
@@ -389,7 +396,7 @@ if (target_os == "win" &&
|
||||
msvc_toolchain("win_clang_" + target_cpu) {
|
||||
environment = "environment." + target_cpu
|
||||
prefix = rebase_path("$clang_base_path/bin", root_build_dir)
|
||||
- cl = "${goma_prefix}$prefix/${clang_cl}"
|
||||
+ cl = "${clang_prefix}$prefix/${clang_cl}"
|
||||
sys_include_flags = "${target_cpu_toolchain_data.include_flags_imsvc}"
|
||||
|
||||
toolchain_args = {
|
||||
@@ -431,7 +438,7 @@ template("win_x64_toolchains") {
|
||||
msvc_toolchain("win_clang_" + target_name) {
|
||||
environment = "environment.x64"
|
||||
prefix = rebase_path("$clang_base_path/bin", root_build_dir)
|
||||
- cl = "${goma_prefix}$prefix/${clang_cl}"
|
||||
+ cl = "${clang_prefix}$prefix/${clang_cl}"
|
||||
sys_include_flags = "${x64_toolchain_data.include_flags_imsvc}"
|
||||
|
||||
toolchain_args = {
|
Loading…
Add table
Add a link
Reference in a new issue