From f71a6db3fff711b27b4b4120343e2a568ca42cc1 Mon Sep 17 00:00:00 2001 From: Keeley Hammond Date: Wed, 2 Mar 2022 16:57:26 -0800 Subject: [PATCH] ci: disable use-thin-lto on Mac only (#33115) * build: remove use_thin_lto = false * ci: enabling if things get really bad (all darwin) * build: lol don't enable that * build: add patch to disable thin lto for mac --- build/args/all.gn | 3 --- patches/chromium/.patches | 1 + .../build_disable_thin_lto_on_mac.patch | 22 +++++++++++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 patches/chromium/build_disable_thin_lto_on_mac.patch diff --git a/build/args/all.gn b/build/args/all.gn index 332a3660fd29..a346a9b3d493 100644 --- a/build/args/all.gn +++ b/build/args/all.gn @@ -35,9 +35,6 @@ enable_pseudolocales = false is_cfi = false -# This consumes a bit too much disk space on macOS -use_thin_lto = false - # Make application name configurable at runtime for cookie crypto allow_runtime_configurable_key_storage = true diff --git a/patches/chromium/.patches b/patches/chromium/.patches index 65d928576198..995bb12ffa7c 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -112,3 +112,4 @@ feat_add_data_transfer_to_requestsingleinstancelock.patch fix_crash_when_saving_edited_pdf_files.patch port_autofill_colors_to_the_color_pipeline.patch build_disable_partition_alloc_on_mac.patch +build_disable_thin_lto_on_mac.patch diff --git a/patches/chromium/build_disable_thin_lto_on_mac.patch b/patches/chromium/build_disable_thin_lto_on_mac.patch new file mode 100644 index 000000000000..f5ffa86766c1 --- /dev/null +++ b/patches/chromium/build_disable_thin_lto_on_mac.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: VerteDinde +Date: Tue, 1 Mar 2022 11:31:59 -0800 +Subject: build: disable thin lto on mac + +Ths build disables thin lto for mac, in order to preserve +disk space on mac without breaking win-ia32. +The patch can be removed when we have more disk space on CircleCI + +diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni +index 9d25c10587c7ab4e2053f8f69aef3f135ef8e9f9..8d8b8d13c62da1fdd051019c8b726de7d1783113 100644 +--- a/build/config/compiler/compiler.gni ++++ b/build/config/compiler/compiler.gni +@@ -74,7 +74,7 @@ declare_args() { + use_thin_lto = + is_cfi || + (is_clang && is_official_build && chrome_pgo_phase != 1 && +- (is_linux || is_win || is_mac || ++ (is_linux || is_win || + (is_android && target_os != "chromeos") || + ((is_chromeos_ash || is_chromeos_lacros) && is_chromeos_device))) +