From: Michael Froman <mfroman@mozilla.com>
Date: Mon, 20 Jun 2022 22:34:00 +0000
Subject: Bug 1775143 - pt18 - (mirror) (cherry-pick) glandium's D149205.patch
 r=ng

Depends on D149831

Differential Revision: https://phabricator.services.mozilla.com/D149832
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/3a785d486d97fc9cb263eafb0fe8f2148fc0b101
---
 config/BUILDCONFIG.gn                | 6 +++---
 config/mac/mac_sdk.gni               | 6 +++---
 config/win/visual_studio_version.gni | 2 +-
 win/BUILD.gn                         | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/config/BUILDCONFIG.gn b/config/BUILDCONFIG.gn
index dd6a105ee..4d9c9f5db 100644
--- a/config/BUILDCONFIG.gn
+++ b/config/BUILDCONFIG.gn
@@ -244,7 +244,7 @@ _default_toolchain = ""
 
 if (target_os == "android") {
   # Targeting android on Mac is best-effort and not guaranteed to work.
-  assert(host_os == "linux", "Android builds are only supported on Linux.")
+  #assert(host_os == "linux", "Android builds are only supported on Linux.")
   _default_toolchain = "//build/toolchain/android:android_clang_$target_cpu"
 } else if (target_os == "chromeos" || target_os == "linux" || target_os == "openbsd") {
   # See comments in build/toolchain/cros/BUILD.gn about board compiles.
@@ -258,8 +258,8 @@ if (target_os == "android") {
 } else if (target_os == "ios") {
   _default_toolchain = "//build/toolchain/ios:ios_clang_$target_cpu"
 } else if (target_os == "mac") {
-  assert(host_os == "mac" || host_os == "linux",
-         "Mac cross-compiles are unsupported.")
+  #assert(host_os == "mac" || host_os == "linux",
+  #       "Mac cross-compiles are unsupported.")
   _default_toolchain = "//build/toolchain/mac:clang_$target_cpu"
 } else if (target_os == "win") {
   # On Windows, we use the same toolchain for host and target by default.
diff --git a/config/mac/mac_sdk.gni b/config/mac/mac_sdk.gni
index 05cd6f791..1b8a4c8c0 100644
--- a/config/mac/mac_sdk.gni
+++ b/config/mac/mac_sdk.gni
@@ -130,9 +130,9 @@ if (mac_use_xcode_symlinks) {
 }
 sdk_info_args += [ mac_sdk_name ]
 
-_mac_sdk_result = exec_script(script_name, sdk_info_args, "scope")
-xcode_version = _mac_sdk_result.xcode_version
-xcode_build = _mac_sdk_result.xcode_build
+#_mac_sdk_result = exec_script(script_name, sdk_info_args, "scope")
+#xcode_version = _mac_sdk_result.xcode_version
+#xcode_build = _mac_sdk_result.xcode_build
 if (mac_sdk_path == "" && use_system_xcode && use_remoteexec) {
   mac_sdk_path = _mac_sdk_result.sdk_path
 }
diff --git a/config/win/visual_studio_version.gni b/config/win/visual_studio_version.gni
index bd4116693..256952559 100644
--- a/config/win/visual_studio_version.gni
+++ b/config/win/visual_studio_version.gni
@@ -40,7 +40,7 @@ if (visual_studio_path == "") {
          "You must set the windows_sdk_version if you set the path")
   assert(wdk_path != "",
          "You must set the wdk_path if you set the visual studio path")
-  visual_studio_runtime_dirs = []
+  visual_studio_runtime_dirs = ""
 }
 
 visual_studio_version_logs = [ "windows_sdk_version=${windows_sdk_version}" ]
diff --git a/win/BUILD.gn b/win/BUILD.gn
index 0c47c2c8c..a63996d6d 100644
--- a/win/BUILD.gn
+++ b/win/BUILD.gn
@@ -17,8 +17,8 @@ windows_manifest("default_exe_manifest") {
 }
 
 if (is_win) {
-  assert(host_os != "mac" || target_cpu != "x86",
-         "Windows cross-builds from Mac must be 64-bit.")
+#  assert(host_os != "mac" || target_cpu != "x86",
+#         "Windows cross-builds from Mac must be 64-bit.")
 
   action("copy_cdb_to_output") {
     script = "//build/win/copy_cdb_to_output.py"