Skip to content

Update mac x64 installer script arch detection #7913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ericstj merged 2 commits into from
Sep 17, 2021
Merged

Update mac x64 installer script arch detection #7913

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8951bf
Update mac x64 installer script arch detection
sfoslund Sep 17, 2021
6fde184
Add comments to x64 machine detection script
sfoslund Sep 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Add comments to x64 machine detection script
  • Loading branch information
@sfoslund
sfoslund committed Sep 17, 2021
commit 6fde1846cd1e4b330306f6edde0f18226ef83a94
5 changes: 4 additions & 1 deletion src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateMacOSDistributionFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@ function IsX64Machine() {
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;
Expand Down