Use com.apple.oahd.plist for rosetta 2 detection

This commit is contained in:
Matthew Bauer 2020-12-04 13:26:53 -06:00
parent 4b9acf4e21
commit 3c9b7029ba

View file

@ -140,7 +140,7 @@ StringSet Settings::getDefaultExtraPlatforms()
// machines. Note that we cant force processes from executing // machines. Note that we cant force processes from executing
// x86_64 in aarch64 environments or vice versa since they can // x86_64 in aarch64 environments or vice versa since they can
// always exec with their own binary preferences. // always exec with their own binary preferences.
else if (pathExists("/Library/Apple/usr/libexec/oah")) { else if (pathExists("/Library/Apple/System/Library/LaunchDaemons/com.apple.oahd.plist")) {
if (std::string{SYSTEM} == "x86_64-darwin") if (std::string{SYSTEM} == "x86_64-darwin")
return StringSet{"aarch64-darwin"}; return StringSet{"aarch64-darwin"};
else if (std::string{SYSTEM} == "aarch64-darwin") else if (std::string{SYSTEM} == "aarch64-darwin")