Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

[release/3.1] Add check for running under translation to mac installers #9187

Merged
ericstj merged 2 commits into from
Oct 22, 2021
Merged

[release/3.1] Add check for running under translation to mac installers #9187

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a850bf
Add check for running under translation to mac installers
ericstj Oct 22, 2021
8f13832
Fix strings to be single quoted
ericstj Oct 22, 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
4 changes: 4 additions & 0 deletions src/pkg/packaging/osx/sharedframework/shared-framework-distribution-template.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,18 @@
var machine = system.sysctl("hw.machine");
var cputype = system.sysctl("hw.cputype");
var cpu64 = system.sysctl("hw.cpu64bit_capable");
var translated = system.sysctl("sysctl.proc_translated");
system.log("Machine type: " + machine);
system.log("Cpu type: " + cputype);
system.log("64-bit: " + cpu64);
system.log("Translated: " + translated);

// 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");
// We may be running under translation (Rosetta) that makes it seem like system is x64, if so assume machine is not actually x64
result = result && (translated != "1");
system.log("IsX64Machine: " + result);
return result;
}]]></script>
Expand Down