Skip to content

[release/6.0] x64 on arm64 fixes #7906

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
markwilkie merged 6 commits into from
Sep 18, 2021
Merged

[release/6.0] x64 on arm64 fixes #7906

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4fbe444
Account for target installer arch in mac pkg id generation (#7831)
sfoslund Sep 9, 2021
225f864
Adding detection and retargeting of DOTNETHOME (#7785)
ericstj Sep 3, 2021
a0aa5f3
Remove Bundle override of DOTNETHOME (#7855)
ericstj Sep 8, 2021
aa0a3d3
Ensure workloads can find embedded dotnethome_x64.wxs (#7845)
ericstj Sep 7, 2021
fe23bc1
Adding x64 emulation support for pkg installers (#7893)
sfoslund Sep 16, 2021
3abbdb8
Update mac x64 installer script arch detection (#7913)
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
Update mac x64 installer script arch detection (#7913) 
* Update mac x64 installer script arch detection

* Add comments to x64 machine detection script
  • Loading branch information
@sfoslund @ericstj
sfoslund authored and ericstj committed Sep 17, 2021
commit 3abbdb89f63d146a52c999724d409675f6fdcaf2
18 changes: 13 additions & 5 deletions 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 @@ -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));
Expand Down