0012.patch (3621B)
1 From: Michael Froman <mfroman@mozilla.com> 2 Date: Mon, 20 Jun 2022 22:34:00 +0000 3 Subject: Bug 1775143 - pt18 - (mirror) (cherry-pick) glandium's D149205.patch 4 r=ng 5 6 Depends on D149831 7 8 Differential Revision: https://phabricator.services.mozilla.com/D149832 9 Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/3a785d486d97fc9cb263eafb0fe8f2148fc0b101 10 --- 11 config/BUILDCONFIG.gn | 6 +++--- 12 config/mac/mac_sdk.gni | 6 +++--- 13 config/win/visual_studio_version.gni | 2 +- 14 win/BUILD.gn | 4 ++-- 15 4 files changed, 9 insertions(+), 9 deletions(-) 16 17 diff --git a/config/BUILDCONFIG.gn b/config/BUILDCONFIG.gn 18 index dd6a105ee..4d9c9f5db 100644 19 --- a/config/BUILDCONFIG.gn 20 +++ b/config/BUILDCONFIG.gn 21 @@ -244,7 +244,7 @@ _default_toolchain = "" 22 23 if (target_os == "android") { 24 # Targeting android on Mac is best-effort and not guaranteed to work. 25 - assert(host_os == "linux", "Android builds are only supported on Linux.") 26 + #assert(host_os == "linux", "Android builds are only supported on Linux.") 27 _default_toolchain = "//build/toolchain/android:android_clang_$target_cpu" 28 } else if (target_os == "chromeos" || target_os == "linux" || target_os == "openbsd") { 29 # See comments in build/toolchain/cros/BUILD.gn about board compiles. 30 @@ -258,8 +258,8 @@ if (target_os == "android") { 31 } else if (target_os == "ios") { 32 _default_toolchain = "//build/toolchain/ios:ios_clang_$target_cpu" 33 } else if (target_os == "mac") { 34 - assert(host_os == "mac" || host_os == "linux", 35 - "Mac cross-compiles are unsupported.") 36 + #assert(host_os == "mac" || host_os == "linux", 37 + # "Mac cross-compiles are unsupported.") 38 _default_toolchain = "//build/toolchain/mac:clang_$target_cpu" 39 } else if (target_os == "win") { 40 # On Windows, we use the same toolchain for host and target by default. 41 diff --git a/config/mac/mac_sdk.gni b/config/mac/mac_sdk.gni 42 index 05cd6f791..1b8a4c8c0 100644 43 --- a/config/mac/mac_sdk.gni 44 +++ b/config/mac/mac_sdk.gni 45 @@ -130,9 +130,9 @@ if (mac_use_xcode_symlinks) { 46 } 47 sdk_info_args += [ mac_sdk_name ] 48 49 -_mac_sdk_result = exec_script(script_name, sdk_info_args, "scope") 50 -xcode_version = _mac_sdk_result.xcode_version 51 -xcode_build = _mac_sdk_result.xcode_build 52 +#_mac_sdk_result = exec_script(script_name, sdk_info_args, "scope") 53 +#xcode_version = _mac_sdk_result.xcode_version 54 +#xcode_build = _mac_sdk_result.xcode_build 55 if (mac_sdk_path == "" && use_system_xcode && use_remoteexec) { 56 mac_sdk_path = _mac_sdk_result.sdk_path 57 } 58 diff --git a/config/win/visual_studio_version.gni b/config/win/visual_studio_version.gni 59 index bd4116693..256952559 100644 60 --- a/config/win/visual_studio_version.gni 61 +++ b/config/win/visual_studio_version.gni 62 @@ -40,7 +40,7 @@ if (visual_studio_path == "") { 63 "You must set the windows_sdk_version if you set the path") 64 assert(wdk_path != "", 65 "You must set the wdk_path if you set the visual studio path") 66 - visual_studio_runtime_dirs = [] 67 + visual_studio_runtime_dirs = "" 68 } 69 70 visual_studio_version_logs = [ "windows_sdk_version=${windows_sdk_version}" ] 71 diff --git a/win/BUILD.gn b/win/BUILD.gn 72 index 0c47c2c8c..a63996d6d 100644 73 --- a/win/BUILD.gn 74 +++ b/win/BUILD.gn 75 @@ -17,8 +17,8 @@ windows_manifest("default_exe_manifest") { 76 } 77 78 if (is_win) { 79 - assert(host_os != "mac" || target_cpu != "x86", 80 - "Windows cross-builds from Mac must be 64-bit.") 81 +# assert(host_os != "mac" || target_cpu != "x86", 82 +# "Windows cross-builds from Mac must be 64-bit.") 83 84 action("copy_cdb_to_output") { 85 script = "//build/win/copy_cdb_to_output.py"