Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 23:02:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1921706 - simplify removing libatomic on linux builds. r=ng,webrtc-reviewers DONTBUILD

Browse Source 
Note: this produces no changes in the generated moz.build files.

o  changeset:   597701:a26d44969a83
~  user:        Michael Froman <mfroman@mozilla.com>
   date:        Mon Jun 14 17:39:29 2021 -0500
   files:       third_party/libwebrtc/build/config/linux/BUILD.gn
   description:
   Bug 1654112 - don't use libatomic on linux builds. r=ng

In moz-central a26d44969a83 I added an include of webrtc.gni for
the build_with_mozilla flag, but there is already a Mozilla
modifcation in this file that does not rely on that flag.  This
simplification will help with future google build directory move.

Differential Revision: https://phabricator.services.mozilla.com/D224069
This commit is contained in:
Michael Froman 2024-10-01 21:05:19 +00:00
parent 913a278eb8
commit 2cbadae418
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
third_party/libwebrtc/build/config/linux/BUILD.gn vendored
View File

@ -2,8 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("../../../webrtc.gni")
import("//build/config/c++/c++.gni")
import("//build/config/chromeos/ui_mode.gni")
import("//build/config/linux/pkg_config.gni")
@ -39,11 +37,14 @@ config("runtime_library") {
defines = [ "OS_CHROMEOS" ]
}
# Mozilla disable libatomic on linux builds
if (false) {
if ((!(is_chromeos_ash || is_chromeos_lacros) ||
default_toolchain != "//build/toolchain/cros:target") &&
(!use_custom_libcxx || target_cpu == "mipsel") && !build_with_mozilla) {
(!use_custom_libcxx || target_cpu == "mipsel")) {
libs = [ "atomic" ]
}
}
}
config("libcap") {
@ -54,6 +55,7 @@ config("libresolv") {
libs = [ "resolv" ]
}
# Mozilla disable glib - Bug 1654112 (hg sha 127ace4d8887)
if (false && use_glib) {
pkg_config("glib") {
packages = [