From 3abbdb89f63d146a52c999724d409675f6fdcaf2 Mon Sep 17 00:00:00 2001
From: Sarah Oslund <sfoslund@microsoft.com>
Date: Fri, 17 Sep 2021 16:07:36 -0700
Subject: [PATCH] Update mac x64 installer script arch detection (#7913)

* Update mac x64 installer script arch detection

* Add comments to x64 machine detection script
---
 .../src/GenerateMacOSDistributionFile.cs       | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateMacOSDistributionFile.cs b/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateMacOSDistributionFile.cs
index 4d988fd2d75..d471bee08dd 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateMacOSDistributionFile.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateMacOSDistributionFile.cs
@@ -42,11 +42,19 @@ public override bool Execute()
 
                 var archScriptContent = @"<![CDATA[
 function IsX64Machine() {
-var machine = system.sysctl(""hw.machine"");
-system.log(""Machine type: "" + machine);
-var result = machine == ""x64"" || machine.endsWith(""_x64"");
-system.log(""IsX64Machine: "" + result);
-return result;
+    var machine = system.sysctl(""hw.foo"");
+    var cputype = system.sysctl(""hw.cputype"");
+    var cpu64 = system.sysctl(""hw.cpu64bit_capable"");
+    system.log(""Machine type: "" + machine);
+    system.log(""Cpu type: "" + cputype);
+    system.log(""64-bit: "" + cpu64);
+
+    // From machine.h
+    // CPU_TYPE_X86_64 = CPU_TYPE_X86 | CPU_ARCH_ABI64 = 0x010000007 = 16777223
+    // CPU_TYPE_X86 = 7
+    var result = machine == ""amd64"" || machine == ""x86_64"" || cputype == ""16777223"" || (cputype == ""7"" && cpu64 == ""1"");
+    system.log(""IsX64Machine: "" + result);
+    return result;
 }
 ]]>";
                 var scriptElement = new XElement("script", new XText(archScriptContent));