From: Michael Froman <mfroman@mozilla.com>
Date: Mon, 20 Jun 2022 22:34:00 +0000
Subject: Bug 1775143 - pt3 - (mirror) 127ace4d8887 r=ng

(skip-generation)

Depends on D149816

Differential Revision: https://phabricator.services.mozilla.com/D149817
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/f9c3bbb23f7ae513b2d94fabd2ada44c6100103b
---
 config/BUILD.gn          |  6 +++---
 config/compiler/BUILD.gn |  4 ++--
 config/linux/BUILD.gn    |  2 +-
 config/sysroot.gni       | 10 +++++-----
 toolchain/linux/BUILD.gn | 30 +++++++++++++++---------------
 5 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/config/BUILD.gn b/config/BUILD.gn
index 9eed1913f..b51e3b9ce 100644
--- a/config/BUILD.gn
+++ b/config/BUILD.gn
@@ -249,9 +249,9 @@ group("common_deps") {
     public_deps += [ "//build/config/sanitizers:deps" ]
   }
 
-  if (use_custom_libcxx) {
-    public_deps += [ "//buildtools/third_party/libc++" ]
-  }
+  #if (use_custom_libcxx) {
+  #  public_deps += [ "//buildtools/third_party/libc++" ]
+  #}
 
   if (use_afl) {
     public_deps += [ "//third_party/afl" ]
diff --git a/config/compiler/BUILD.gn b/config/compiler/BUILD.gn
index 219a2be0e..18d58e37b 100644
--- a/config/compiler/BUILD.gn
+++ b/config/compiler/BUILD.gn
@@ -13,7 +13,7 @@ import("//build/config/clang/clang.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/coverage/coverage.gni")
 import("//build/config/dcheck_always_on.gni")
-import("//build/config/gclient_args.gni")
+#import("//build/config/gclient_args.gni")
 import("//build/config/host_byteorder.gni")
 import("//build/config/rust.gni")
 import("//build/config/sanitizers/sanitizers.gni")
@@ -1304,7 +1304,7 @@ config("compiler_deterministic") {
 }
 
 config("clang_revision") {
-  if (is_clang && clang_base_path == default_clang_base_path) {
+  if (false && is_clang && clang_base_path == default_clang_base_path) {
     update_args = [
       "--print-revision",
       "--verify-version=$clang_version",
diff --git a/config/linux/BUILD.gn b/config/linux/BUILD.gn
index 8e42cf9f2..2bdd08fc4 100644
--- a/config/linux/BUILD.gn
+++ b/config/linux/BUILD.gn
@@ -52,7 +52,7 @@ config("libresolv") {
   libs = [ "resolv" ]
 }
 
-if (use_glib) {
+if (false && use_glib) {
   pkg_config("glib") {
     packages = [
       "glib-2.0",
diff --git a/config/sysroot.gni b/config/sysroot.gni
index 18d2d5736..97be0da77 100644
--- a/config/sysroot.gni
+++ b/config/sysroot.gni
@@ -61,11 +61,11 @@ if (sysroot == "") {
       } else if (_script_arch == "x64") {
         _script_arch = "amd64"
       }
-      assert(
-          exec_script("//build/dir_exists.py",
-                      [ rebase_path(sysroot) ],
-                      "string") == "True",
-          "Missing sysroot ($sysroot). To fix, run: build/linux/sysroot_scripts/install-sysroot.py --arch=$_script_arch")
+      #assert(
+      #    exec_script("//build/dir_exists.py",
+      #                [ rebase_path(sysroot) ],
+      #                "string") == "True",
+      #    "Missing sysroot ($sysroot). To fix, run: build/linux/sysroot_scripts/install-sysroot.py --arch=$_script_arch")
     }
   } else if (is_mac) {
     import("//build/config/mac/mac_sdk.gni")
diff --git a/toolchain/linux/BUILD.gn b/toolchain/linux/BUILD.gn
index ce8004ebd..ca0fcb540 100644
--- a/toolchain/linux/BUILD.gn
+++ b/toolchain/linux/BUILD.gn
@@ -342,21 +342,21 @@ gcc_toolchain("s390x") {
   }
 }
 
-gcc_toolchain("mips64") {
-  cc = "gcc"
-  cxx = "g++"
-
-  readelf = "readelf"
-  nm = "nm"
-  ar = "ar"
-  ld = cxx
-
-  toolchain_args = {
-    current_cpu = "mips64"
-    current_os = "linux"
-    is_clang = false
-  }
-}
+#gcc_toolchain("mips64") {
+#  cc = "gcc"
+#  cxx = "g++"
+#
+#  readelf = "readelf"
+#  nm = "nm"
+#  ar = "ar"
+#  ld = cxx
+#
+#  toolchain_args = {
+#    current_cpu = "mips64"
+#    current_os = "linux"
+#    is_clang = false
+#  }
+#}
 
 gcc_toolchain("ppc64") {
   cc = "gcc"