lix-project/lix
20
58
Fork 31
Code Issues 359 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Use /usr/bin/true

Browse source
This commit is contained in:
Eelco Dolstra 2022-10-14 00:34:31 -07:00
parent 96eb5ef156
commit ddd5503950
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/globals.cc
View file

@ -155,7 +155,7 @@ StringSet Settings::getDefaultExtraPlatforms()
// 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.
if (std::string{SYSTEM} == "aarch64-darwin") { if (std::string{SYSTEM} == "aarch64-darwin") {
if (runProgram(RunOptions {.program = "arch", .args = {"-arch", "x86_64", "/bin/pwd"}, .mergeStderrToStdout = true}).first == 0) { if (runProgram(RunOptions {.program = "arch", .args = {"-arch", "x86_64", "/usr/bin/true"}, .mergeStderrToStdout = true}).first == 0) {
debug("Rosetta detected"); debug("Rosetta detected");
extraPlatforms.insert("x86_64-darwin"); extraPlatforms.insert("x86_64-darwin");
} else } else