0002.patch (3183B)
1 From: Michael Froman <mfroman@mozilla.com> 2 Date: Mon, 20 Jun 2022 22:34:00 +0000 3 Subject: Bug 1775143 - pt3 - (mirror) 127ace4d8887 r=ng 4 5 (skip-generation) 6 7 Depends on D149816 8 9 Differential Revision: https://phabricator.services.mozilla.com/D149817 10 Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/f9c3bbb23f7ae513b2d94fabd2ada44c6100103b 11 --- 12 config/compiler/BUILD.gn | 4 ++-- 13 config/linux/BUILD.gn | 2 +- 14 config/sysroot.gni | 6 +++--- 15 toolchain/linux/BUILD.gn | 30 +++++++++++++++--------------- 16 4 files changed, 21 insertions(+), 21 deletions(-) 17 18 diff --git a/config/compiler/BUILD.gn b/config/compiler/BUILD.gn 19 index 0aa2d1e5c..6b36c5c2a 100644 20 --- a/config/compiler/BUILD.gn 21 +++ b/config/compiler/BUILD.gn 22 @@ -11,7 +11,7 @@ import("//build/config/clang/clang.gni") 23 import("//build/config/compiler/compiler.gni") 24 import("//build/config/coverage/coverage.gni") 25 import("//build/config/dcheck_always_on.gni") 26 -import("//build/config/gclient_args.gni") 27 +#import("//build/config/gclient_args.gni") 28 import("//build/config/host_byteorder.gni") 29 import("//build/config/pch.gni") 30 import("//build/config/rust.gni") 31 @@ -1619,7 +1619,7 @@ config("compiler_deterministic") { 32 } 33 34 config("clang_revision") { 35 - if (is_clang && clang_base_path == default_clang_base_path && 36 + if (false && is_clang && clang_base_path == default_clang_base_path && 37 current_os != "zos") { 38 update_args = [ 39 "--print-revision", 40 diff --git a/config/linux/BUILD.gn b/config/linux/BUILD.gn 41 index 131bb71d1..cc4749ea0 100644 42 --- a/config/linux/BUILD.gn 43 +++ b/config/linux/BUILD.gn 44 @@ -54,7 +54,7 @@ config("libresolv") { 45 libs = [ "resolv" ] 46 } 47 48 -if (use_glib) { 49 +if (false && use_glib) { 50 pkg_config("glib") { 51 packages = [ 52 "glib-2.0", 53 diff --git a/config/sysroot.gni b/config/sysroot.gni 54 index 9264bb700..71eedaaaf 100644 55 --- a/config/sysroot.gni 56 +++ b/config/sysroot.gni 57 @@ -60,9 +60,9 @@ if (sysroot == "") { 58 } else if (_script_arch == "x64") { 59 _script_arch = "amd64" 60 } 61 - assert( 62 - path_exists(sysroot), 63 - "Missing sysroot ($sysroot). To fix, run: build/linux/sysroot_scripts/install-sysroot.py --arch=$_script_arch") 64 + #assert( 65 + # path_exists(sysroot), 66 + # "Missing sysroot ($sysroot). To fix, run: build/linux/sysroot_scripts/install-sysroot.py --arch=$_script_arch") 67 } 68 } else if (is_mac) { 69 import("//build/config/mac/mac_sdk.gni") 70 diff --git a/toolchain/linux/BUILD.gn b/toolchain/linux/BUILD.gn 71 index 484faaa9a..b9fdcdde5 100644 72 --- a/toolchain/linux/BUILD.gn 73 +++ b/toolchain/linux/BUILD.gn 74 @@ -318,21 +318,21 @@ gcc_toolchain("s390x") { 75 } 76 } 77 78 -gcc_toolchain("mips64") { 79 - cc = "gcc" 80 - cxx = "g++" 81 - 82 - readelf = "readelf" 83 - nm = "nm" 84 - ar = "ar" 85 - ld = cxx 86 - 87 - toolchain_args = { 88 - current_cpu = "mips64" 89 - current_os = "linux" 90 - is_clang = false 91 - } 92 -} 93 +#gcc_toolchain("mips64") { 94 +# cc = "gcc" 95 +# cxx = "g++" 96 +# 97 +# readelf = "readelf" 98 +# nm = "nm" 99 +# ar = "ar" 100 +# ld = cxx 101 +# 102 +# toolchain_args = { 103 +# current_cpu = "mips64" 104 +# current_os = "linux" 105 +# is_clang = false 106 +# } 107 +#} 108 109 gcc_toolchain("ppc64") { 110 cc = "gcc"