diff --git a/patch/patch.cfg b/patch/patch.cfg index c945087be..db4a1ffcc 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -436,11 +436,6 @@ patches = [ # https://github.com/chromiumembedded/cef/issues/2196 'name': 'printing_context_2196', }, - { - # mac: Disable thin archives with cef_sandbox builds. - # https://github.com/chromiumembedded/cef/issues/3674 - 'name': 'build', - }, { # macOS: Make the NativeEventProcessor protocol dependency optional. # https://github.com/chromiumembedded/cef/issues/2539 diff --git a/patch/patches/build.patch b/patch/patches/build.patch deleted file mode 100644 index 950155802..000000000 --- a/patch/patches/build.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn -index e579cc9a9d1fd..73f42525d0071 100644 ---- build/config/compiler/BUILD.gn -+++ build/config/compiler/BUILD.gn -@@ -131,6 +131,9 @@ declare_args() { - # The cache can lead to non-determinism: https://crbug.com/1486045 - thin_lto_enable_cache = true - -+ # Whether to use thin archives in combination with lld. -+ use_thin_archives = use_lld -+ - # Initialize all local variables with a pattern. This flag will fill - # uninitialized floating-point types (and 32-bit pointers) with 0xFF and the - # rest with 0xAA. This makes behavior of uninitialized memory bugs consistent, -@@ -2387,6 +2390,7 @@ config("export_dynamic") { - # 2. Remove the thin_archive config, so that the .a file actually contains all - # .o files, instead of just references to .o files in the build directoy - config("thin_archive") { -+ if (use_thin_archives) { - if ((is_apple && use_lld) || (is_linux && !is_clang) || current_os == "aix") { - # The macOS and iOS linker ld64.ldd doesn't support thin archive without - # symbol table, gcc on linux also throws the error `archive has no index`. -@@ -2405,6 +2409,7 @@ config("thin_archive") { - } else if (is_win && use_lld) { - arflags = [ "/llvmlibthin" ] - } -+ } - } - - # exceptions -------------------------------------------------------------------