diff --git a/.circleci/build_config.yml b/.circleci/build_config.yml index 0175d1fd97e9..3d4f5c162644 100644 --- a/.circleci/build_config.yml +++ b/.circleci/build_config.yml @@ -544,6 +544,7 @@ step-electron-build: &step-electron-build (cd out/Default; zip mksnapshot.zip mksnapshot_args clang_x64_v8_arm64/gen/v8/embedded.S) rm -rf out/Default/clang_x64_v8_arm64/gen rm -rf out/Default/clang_x64_v8_arm64/obj + rm -rf out/Default/clang_x64_v8_arm64/thinlto-cache rm -rf out/Default/clang_x64/obj # Regenerate because we just deleted some ninja files @@ -780,6 +781,7 @@ step-show-goma-stats: &step-show-goma-stats step-mksnapshot-build: &step-mksnapshot-build run: name: mksnapshot build + no_output_timeout: 30m command: | cd src if [ "$USE_PREBUILT_V8_CONTEXT_SNAPSHOT" != "1" ]; then diff --git a/patches/chromium/.patches b/patches/chromium/.patches index c470189487c0..7dcf136c3492 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -112,6 +112,5 @@ 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 fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch remove_incorrect_width_height_adjustments.patch diff --git a/patches/chromium/build_disable_thin_lto_on_mac.patch b/patches/chromium/build_disable_thin_lto_on_mac.patch deleted file mode 100644 index f5ffa86766c1..000000000000 --- a/patches/chromium/build_disable_thin_lto_on_mac.patch +++ /dev/null @@ -1,22 +0,0 @@ -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))) -