0014.patch (1724B)
1 From: Michael Froman <mfroman@mozilla.com> 2 Date: Mon, 20 Jun 2022 22:34:00 +0000 3 Subject: Bug 1921706 - simplify removing libatomic on linux builds. 4 r=ng,webrtc-reviewers DONTBUILD 5 6 Note: this produces no changes in the generated moz.build files. 7 8 o changeset: 597701:a26d44969a83 9 ~ user: Michael Froman <mfroman@mozilla.com> 10 date: Mon Jun 14 17:39:29 2021 -0500 11 files: third_party/libwebrtc/build/config/linux/BUILD.gn 12 description: 13 Bug 1654112 - don't use libatomic on linux builds. r=ng 14 15 In moz-central a26d44969a83 I added an include of webrtc.gni for 16 the build_with_mozilla flag, but there is already a Mozilla 17 modifcation in this file that does not rely on that flag. This 18 simplification will help with future google build directory move. 19 20 Differential Revision: https://phabricator.services.mozilla.com/D224069 21 Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/d57bb9cfa9a7679fa5d3f47ae9343928700ec103 22 --- 23 config/linux/BUILD.gn | 4 ++++ 24 1 file changed, 4 insertions(+) 25 26 diff --git a/config/linux/BUILD.gn b/config/linux/BUILD.gn 27 index cc4749ea0..b96e8cbe3 100644 28 --- a/config/linux/BUILD.gn 29 +++ b/config/linux/BUILD.gn 30 @@ -40,10 +40,13 @@ config("runtime_library") { 31 defines = [ "OS_CHROMEOS" ] 32 } 33 34 + # Mozilla disable libatomic on linux builds 35 + if (false) { 36 if ((!is_chromeos || default_toolchain != "//build/toolchain/cros:target") && 37 (!use_custom_libcxx || current_cpu == "mipsel")) { 38 libs = [ "atomic" ] 39 } 40 + } 41 } 42 43 config("libcap") { 44 @@ -54,6 +57,7 @@ config("libresolv") { 45 libs = [ "resolv" ] 46 } 47 48 +# Mozilla disable glib - Bug 1654112 (hg sha 127ace4d8887) 49 if (false && use_glib) { 50 pkg_config("glib") { 51 packages = [