remove c++ module stuff

2 files changed, 38 insertions, 20 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index c73d366..2482b38 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -15,7 +15,7 @@ AUX chromium-140-compiler-r1.patch 17997 BLAKE2B b116858756b692550bb087497a5c349
 AUX chromium-140-compiler.patch 17875 BLAKE2B 92f700b2c0b40c382e588eb41a965947b2e45f2893c7991a2749057c39b2aa16b9a88ad086d06ef89b11705ff2b0eb356f307910d196fe39decd7f327347f8fa SHA512 58e1240cdea826b0679db67f70a34b1c3e7e667415e0a98b8d33ce6f3125cdc1c0e2a60ae8a363964e0407e12e03fd4b3dc652f45da0f3a70dc959d53355ad19
 AUX chromium-140-gni-lf.patch 1242 BLAKE2B 3686048909b6f4417951c1709b3d757ec6e732b1ed12e757e7004948169af06f6c747d44cc6b29e56e41d495b64d8ca9e4b4d9211b824f6794d70eb23c972a88 SHA512 8ad0b2c0184c86081e8693ac4c533e962707409b77256a222dab7116dd38dfec55a813c52ff294aca8c81334579dbf463e0355a2addb5323a896946f5069f403
 AUX chromium-140-rust-1.8x.patch 626 BLAKE2B 3dcd6ace2bd8e8072e0a12eb8035bfc060f59fe55b20e623ff16897bf79596991773eab4f1e7a1d1b8334a2b3193f208524f4397ba1ff10e78a70f94c7ff7723 SHA512 ecc8cdef7409f6fc2a0af5ea8f9909d30b267457120e0a87702726a213446607c9473b521420d6738d1113c6697bd0a0716d9a2097d70b9d396b3dc35d7c7660
-AUX chromium-141-compiler.patch 17791 BLAKE2B 06da934a65fd3ce4e33870901c5ac603ad055dcaadcf60cbf3b565b8c076e3a939800020e496ff009d151f11a16f07ade4ea0de343aa53086ff484f74d4ab6b7 SHA512 6bd369abadf0bc2eddcedd00c3c1ed127b9fddfaab4fa0de36dfdd84c814d1338967d1ea1004fe8f6dde107311c88fe9cb30902562c92847beb0e72b381cf48d
+AUX chromium-141-compiler.patch 18134 BLAKE2B 71ae2c1c55c41a73e61875f954f014ede22a591c798af4e0fbac7372272c554daf3457a58c5a2c455c55aa75a982667df27507e6a384e546fe7fe9e64c365070 SHA512 49f4bbadfb2b484e4918fe3c1bd99bc4181500996884bee99fc3944f31a4dc2eb10dc473a680a2f586af5dd745b14509d71a743762a9113cdf19f5448f1cd0ed
 AUX chromium-141-mv2-ungoogled.patch 7180 BLAKE2B 5d4c0aa6c85aa62d77691b64ef9f99054977674fd05462f7eaa5612f8372ed0c9f8a92f480bcf6a152657c21f266f1449814f070f6510773214e2b55a8a868f2 SHA512 7dd646188b4db14cba565a3a91dbb8a0c101c74d46b23d43647dde57ba1abef80196d46623f7f66049fb80ac14c3dff872cf0bb78a7a59e073701899f8b235fb
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
 AUX chromium-cross-compile.patch 323 BLAKE2B 8d5091ce5287422c9688ede2563360a96b8bd34b9750dc1c8f0b6ca9aeff2c066fac2da169396baa131d971c087c78f9af53999df0e102d1f57176f5e8d3dd57 SHA512 06d3afc1aa19e57daac0e4bad37e1f365a68408240430e5e818e5a4f12e3b7519214eafa463633e447e7029f4ae13ea864ca347ad1fac117702a0be88718a954
diff --git a/www-client/chromium/files/chromium-141-compiler.patch b/www-client/chromium/files/chromium-141-compiler.patch
index 6627b1f..f384b4d 100644
--- a/www-client/chromium/files/chromium-141-compiler.patch
+++ b/www-client/chromium/files/chromium-141-compiler.patch
@@ -1,5 +1,5 @@
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 298e37f832..f6f2b0a345 100644
+index 298e37f832..b38f7d3844 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
 @@ -265,15 +265,6 @@ declare_args() {
@@ -180,10 +180,20 @@ index 298e37f832..f6f2b0a345 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 RBE cache entries.
-@@ -1709,107 +1590,6 @@ config("compiler_deterministic") {
+@@ -1699,115 +1580,6 @@ config("compiler_deterministic") {
+       ldflags += [ "-no-canonical-prefixes" ]
+     }
    }
- }
- 
+-
+-  if (use_clang_modules) {
+-    cflags += [
+-      # This removes absolute paths from .pcm files.
+-      "-Xclang",
+-      "-fmodule-file-home-is-cwd",
+-    ]
+-  }
+-}
+-
 -config("clang_revision") {
 -  if (is_clang && clang_base_path == default_clang_base_path &&
 -      current_os != "zos") {
@@ -283,12 +293,10 @@ index 298e37f832..f6f2b0a345 100644
 -    inputs = [ clang_warning_suppression_file ]
 -    cflags = [ "--warning-suppression-mappings=" + from_build_root ]
 -  }
--}
--
+ }
+ 
  # Enable bounds checks when indexing directly (i.e. not via a pointer)
- # into C arrays. This aligns with libc++ hardening for
- # `std::array::operator[]`.
-@@ -1833,18 +1613,6 @@ config("sanitize_c_array_bounds") {
+@@ -1833,18 +1605,6 @@ config("sanitize_c_array_bounds") {
    }
  }
  
@@ -307,7 +315,17 @@ index 298e37f832..f6f2b0a345 100644
  config("compiler_arm_fpu") {
    if (current_cpu == "arm" && !is_ios) {
      cflags = [ "-mfpu=$arm_fpu" ]
-@@ -2288,11 +2056,7 @@ config("chromium_code") {
+@@ -1869,7 +1629,8 @@ config("compiler_arm") {
+   }
+ }
+ 
+-config("libcxx_module") {
++config("libcxx_module") {}
++config("libcxx_modulex") {
+   if (use_clang_modules) {
+     cflags_cc = [
+       "-fmodules",
+@@ -2288,11 +2049,7 @@ config("chromium_code") {
        defines = [ "_HAS_NODISCARD" ]
      }
    } else {
@@ -320,7 +338,7 @@ index 298e37f832..f6f2b0a345 100644
  
      # In Chromium code, we define __STDC_foo_MACROS in order to get the
      # C99 macros on Mac and Linux.
-@@ -2301,24 +2065,6 @@ config("chromium_code") {
+@@ -2301,24 +2058,6 @@ config("chromium_code") {
        "__STDC_FORMAT_MACROS",
      ]
  
@@ -345,7 +363,7 @@ index 298e37f832..f6f2b0a345 100644
      if (is_apple) {
        cflags_objc = [ "-Wimplicit-retain-self" ]
        cflags_objcc = [ "-Wimplicit-retain-self" ]
-@@ -2734,7 +2480,8 @@ config("default_stack_frames") {
+@@ -2734,7 +2473,8 @@ config("default_stack_frames") {
  # [0]: https://pinpoint-dot-chromeperf.appspot.com/job/147634a8be0000
  # [1]: https://pinpoint-dot-chromeperf.appspot.com/job/132bc772be0000
  # [2]: https://crrev.com/c/5447532
@@ -355,7 +373,7 @@ index 298e37f832..f6f2b0a345 100644
    if (is_win) {
      # clang-cl's /O2 corresponds to clang's -O3, and really want -O2 for
      # consistency with the other platforms.
-@@ -2783,7 +2530,8 @@ config("optimize") {
+@@ -2783,7 +2523,8 @@ config("optimize") {
  }
  
  # Turn off optimizations.
@@ -365,7 +383,7 @@ index 298e37f832..f6f2b0a345 100644
    if (is_win) {
      cflags = [
        "/Od",  # Disable optimization.
-@@ -2818,7 +2566,8 @@ config("no_optimize") {
+@@ -2818,7 +2559,8 @@ config("no_optimize") {
  # Turns up the optimization level. Used to explicitly enable -O2 instead of
  # -Os for select targets on platforms that use optimize_for_size. No-op
  # elsewhere.
@@ -375,7 +393,7 @@ index 298e37f832..f6f2b0a345 100644
    ldflags = common_optimize_on_ldflags
    if (is_win) {
      # Favor speed over size, /O2 must be before the common flags.
-@@ -2839,7 +2588,8 @@ config("optimize_max") {
+@@ -2839,7 +2581,8 @@ config("optimize_max") {
  #
  # TODO(crbug.com/41259697) - rework how all of these configs are related
  # so that we don't need this disclaimer.
@@ -385,7 +403,7 @@ index 298e37f832..f6f2b0a345 100644
    ldflags = common_optimize_on_ldflags
    if (is_win) {
      # Favor speed over size, /O2 must be before the common flags.
-@@ -2856,7 +2606,8 @@ config("optimize_speed") {
+@@ -2856,7 +2599,8 @@ config("optimize_speed") {
    rustflags = [ "-Copt-level=3" ]
  }
  
@@ -395,7 +413,7 @@ index 298e37f832..f6f2b0a345 100644
    cflags = [ "-O1" ] + common_optimize_on_cflags
    rustflags = [ "-Copt-level=1" ]
    ldflags = common_optimize_on_ldflags
-@@ -2983,7 +2734,8 @@ config("win_pdbaltpath") {
+@@ -2983,7 +2727,8 @@ config("win_pdbaltpath") {
  }
  
  # Full symbols.
@@ -405,7 +423,7 @@ index 298e37f832..f6f2b0a345 100644
    rustflags = []
    configs = []
    if (is_win) {
-@@ -3139,7 +2891,8 @@ config("symbols") {
+@@ -3139,7 +2884,8 @@ config("symbols") {
  # Minimal symbols.
  # This config guarantees to hold symbol for stack trace which are shown to user
  # when crash happens in unittests running on buildbot.
@@ -415,7 +433,7 @@ index 298e37f832..f6f2b0a345 100644
    rustflags = []
    if (is_win) {
      # Functions, files, and line tables only.
-@@ -3215,7 +2968,8 @@ config("minimal_symbols") {
+@@ -3215,7 +2961,8 @@ config("minimal_symbols") {
  # This configuration contains function names only. That is, the compiler is
  # told to not generate debug information and the linker then just puts function
  # names in the final debug information.