diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2021-10-15 09:02:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-15 09:02:16 +0200 |
| commit | c574ab39077dde5e424cab05927f37ad2e5a50ad (patch) | |
| tree | 38f5fbc4a593ff6b6f929a2df6519d48038cbfc6 /src | |
| parent | 330650d294ff1cfe2e45ec72f09f2c3f3b80a2d0 (diff) | |
| parent | a9d9e5555118025032eabd9612e03473a97ebff8 (diff) | |
Merge pull request #5388 from yvt/fix-oahd-path
Add another path where a Rosetta 2 daemon plist file is possibly located
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstore/globals.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index 6934801e3..4903d0922 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -148,7 +148,8 @@ StringSet Settings::getDefaultExtraPlatforms() // machines. Note that we can’t force processes from executing // x86_64 in aarch64 environments or vice versa since they can // always exec with their own binary preferences. - if (pathExists("/Library/Apple/System/Library/LaunchDaemons/com.apple.oahd.plist")) { + if (pathExists("/Library/Apple/System/Library/LaunchDaemons/com.apple.oahd.plist") || + pathExists("/System/Library/LaunchDaemons/com.apple.oahd.plist")) { if (std::string{SYSTEM} == "x86_64-darwin") extraPlatforms.insert("aarch64-darwin"); else if (std::string{SYSTEM} == "aarch64-darwin") |