0009.patch (2692B)
1 From: Michael Froman <mfroman@mozilla.com> 2 Date: Mon, 20 Jun 2022 22:34:00 +0000 3 Subject: Bug 1775143 - pt15 - (mirror) 0300b32b7de7 r=ng 4 5 (skip-generation) 6 7 Depends on D149828 8 9 Differential Revision: https://phabricator.services.mozilla.com/D149829 10 Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/831cdef4bf346cb9cc0092ab7e7beea0aa6677c3 11 --- 12 config/BUILDCONFIG.gn | 7 ++++--- 13 config/ui.gni | 2 +- 14 2 files changed, 5 insertions(+), 4 deletions(-) 15 16 diff --git a/config/BUILDCONFIG.gn b/config/BUILDCONFIG.gn 17 index a9d2caeb1..dd6a105ee 100644 18 --- a/config/BUILDCONFIG.gn 19 +++ b/config/BUILDCONFIG.gn 20 @@ -136,7 +136,7 @@ declare_args() { 21 is_official_build = false 22 23 # Set to true when compiling with the Clang compiler. 24 - is_clang = current_os != "linux" || 25 + is_clang = current_os != "linux" || current_os == "openbsd" || 26 (current_cpu != "s390x" && current_cpu != "s390" && 27 current_cpu != "ppc64" && current_cpu != "ppc" && 28 current_cpu != "mips" && current_cpu != "mips64" && 29 @@ -206,7 +206,7 @@ if (host_toolchain == "") { 30 # TODO(dpranke): Add some sort of assert here that verifies that 31 # no toolchain omitted host_toolchain from its toolchain_args(). 32 33 - if (host_os == "linux") { 34 + if (host_os == "linux" || host_os == "openbsd") { 35 if (target_os != "linux") { 36 host_toolchain = "//build/toolchain/linux:clang_$host_cpu" 37 } else if (is_clang) { 38 @@ -246,7 +246,7 @@ if (target_os == "android") { 39 # Targeting android on Mac is best-effort and not guaranteed to work. 40 assert(host_os == "linux", "Android builds are only supported on Linux.") 41 _default_toolchain = "//build/toolchain/android:android_clang_$target_cpu" 42 -} else if (target_os == "chromeos" || target_os == "linux") { 43 +} else if (target_os == "chromeos" || target_os == "linux" || target_os == "openbsd") { 44 # See comments in build/toolchain/cros/BUILD.gn about board compiles. 45 if (is_clang) { 46 _default_toolchain = "//build/toolchain/linux:clang_$target_cpu" 47 @@ -314,6 +314,7 @@ is_chromeos = current_os == "chromeos" 48 is_fuchsia = current_os == "fuchsia" 49 is_ios = current_os == "ios" 50 is_linux = current_os == "linux" 51 +is_bsd = current_os == "openbsd" 52 is_mac = current_os == "mac" 53 is_nacl = current_os == "nacl" 54 is_wasm = current_os == "emscripten" 55 diff --git a/config/ui.gni b/config/ui.gni 56 index 9e7f4df85..2c526a92f 100644 57 --- a/config/ui.gni 58 +++ b/config/ui.gni 59 @@ -39,7 +39,7 @@ declare_args() { 60 target_os != "android" 61 } 62 63 -assert(!use_glib || (is_linux && !is_castos)) 64 +assert(!use_glib || ((is_linux || is_bsd) && !is_castos)) 65 66 use_atk = use_glib && current_toolchain == default_toolchain