0011.patch (2792B)
1 From: Michael Froman <mfroman@mozilla.com> 2 Date: Mon, 20 Jun 2022 22:34:00 +0000 3 Subject: Bug 1775143 - pt17 - account for is_desktop_linux going away and 4 using is_linux r=ng 5 6 (skip-generation) 7 8 Depends on D149830 9 10 Differential Revision: https://phabricator.services.mozilla.com/D149831 11 Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/aad17933ade0176606c4d7b694669bc67f5f92b5 12 --- 13 config/compiler/BUILD.gn | 2 +- 14 config/linux/gtk/gtk.gni | 2 +- 15 config/ozone.gni | 4 ++-- 16 config/ui.gni | 2 +- 17 4 files changed, 5 insertions(+), 5 deletions(-) 18 19 diff --git a/config/compiler/BUILD.gn b/config/compiler/BUILD.gn 20 index 6b36c5c2a..422161013 100644 21 --- a/config/compiler/BUILD.gn 22 +++ b/config/compiler/BUILD.gn 23 @@ -2308,7 +2308,7 @@ config("no_rtti") { 24 # (de)allocate memory on a different heap, which would spell trouble if pointers 25 # to heap-allocated memory are passed over shared library boundaries. 26 config("export_dynamic") { 27 - if (is_linux || export_libcxxabi_from_executables) { 28 + if (is_linux || is_bsd || export_libcxxabi_from_executables) { 29 ldflags = [ "-rdynamic" ] 30 } 31 } 32 diff --git a/config/linux/gtk/gtk.gni b/config/linux/gtk/gtk.gni 33 index 9e6131d4c..4f560b290 100644 34 --- a/config/linux/gtk/gtk.gni 35 +++ b/config/linux/gtk/gtk.gni 36 @@ -6,7 +6,7 @@ import("//build/config/ui.gni") 37 38 declare_args() { 39 # Whether or not we should use libgtk. 40 - use_gtk = is_linux && !is_castos 41 + use_gtk = (is_linux || is_bsd) && !is_castos 42 43 # The (major) version of GTK to build against. A different version may be 44 # loaded at runtime. 45 diff --git a/config/ozone.gni b/config/ozone.gni 46 index 9c92cdc02..a74459ca9 100644 47 --- a/config/ozone.gni 48 +++ b/config/ozone.gni 49 @@ -8,7 +8,7 @@ import("//build/toolchain/toolchain.gni") 50 declare_args() { 51 # Indicates if Ozone is enabled. Ozone is a low-level library layer for Linux 52 # that does not require X11. 53 - use_ozone = is_chromeos || is_fuchsia || is_linux 54 + use_ozone = is_chromeos || is_fuchsia || is_linux || is_bsd 55 } 56 57 declare_args() { 58 @@ -80,7 +80,7 @@ declare_args() { 59 ozone_platform = "x11" 60 ozone_platform_drm = true 61 ozone_platform_x11 = true 62 - } else if (is_linux) { 63 + } else if (is_linux || is_bsd) { 64 ozone_platform = "x11" 65 ozone_platform_wayland = true 66 ozone_platform_x11 = true 67 diff --git a/config/ui.gni b/config/ui.gni 68 index 2c526a92f..20e446e34 100644 69 --- a/config/ui.gni 70 +++ b/config/ui.gni 71 @@ -33,7 +33,7 @@ declare_args() { 72 toolkit_views = is_mac || is_win || is_linux || is_chromeos || is_fuchsia 73 74 use_glib = 75 - is_linux && !is_castos && 76 + (is_linux || is_bsd) && !is_castos && 77 # Avoid the need for glib when Android is building things via secondary 78 # toolchains. 79 target_os != "android"