diff options
Diffstat (limited to 'www/chromium/files/patch-build_config_BUILDCONFIG.gn')
| -rw-r--r-- | www/chromium/files/patch-build_config_BUILDCONFIG.gn | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/www/chromium/files/patch-build_config_BUILDCONFIG.gn b/www/chromium/files/patch-build_config_BUILDCONFIG.gn index b0ec51d03b3a..c07dd880c4a1 100644 --- a/www/chromium/files/patch-build_config_BUILDCONFIG.gn +++ b/www/chromium/files/patch-build_config_BUILDCONFIG.gn @@ -1,4 +1,4 @@ ---- build/config/BUILDCONFIG.gn.orig 2025-05-05 10:57:53 UTC +--- build/config/BUILDCONFIG.gn.orig 2025-09-06 10:01:20 UTC +++ build/config/BUILDCONFIG.gn @@ -136,7 +136,8 @@ declare_args() { is_official_build = false @@ -10,7 +10,7 @@ (current_cpu != "s390x" && current_cpu != "s390" && current_cpu != "ppc64" && current_cpu != "ppc" && current_cpu != "mips" && current_cpu != "mips64" && -@@ -235,6 +236,10 @@ if (host_toolchain == "") { +@@ -242,6 +243,10 @@ if (host_toolchain == "") { host_toolchain = "//build/toolchain/aix:$host_cpu" } else if (host_os == "zos") { host_toolchain = "//build/toolchain/zos:$host_cpu" @@ -21,16 +21,16 @@ } else { assert(false, "Unsupported host_os: $host_os") } -@@ -279,6 +284,8 @@ if (target_os == "android") { - _default_toolchain = "//build/toolchain/aix:$target_cpu" - } else if (target_os == "zos") { - _default_toolchain = "//build/toolchain/zos:$target_cpu" +@@ -291,6 +296,8 @@ if (target_os == "android") { + assert( + false, + "emscripten is not a supported target_os. It is available only as secondary toolchain.") +} else if (target_os == "openbsd" || target_os == "freebsd") { + _default_toolchain = host_toolchain } else { assert(false, "Unsupported target_os: $target_os") } -@@ -313,7 +320,11 @@ is_android = current_os == "android" +@@ -325,7 +332,11 @@ is_android = current_os == "android" is_chromeos = current_os == "chromeos" is_fuchsia = current_os == "fuchsia" is_ios = current_os == "ios" @@ -41,5 +41,5 @@ +is_freebsd = current_os == "freebsd" +is_bsd = current_os == "openbsd" || current_os == "freebsd" is_mac = current_os == "mac" - is_nacl = current_os == "nacl" - is_wasm = current_os == "emscripten" + + # TODO(crbug.com/40511454): Remove is_nacl from all build files, then |