Fix build warnings on MacOS
This commit is contained in:
parent
2eefdc7208
commit
a18d9269a5
|
@ -342,7 +342,7 @@ int childEntry(void * arg)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if __linux__
|
||||||
static void linkOrCopy(const Path & from, const Path & to)
|
static void linkOrCopy(const Path & from, const Path & to)
|
||||||
{
|
{
|
||||||
if (link(from.c_str(), to.c_str()) == -1) {
|
if (link(from.c_str(), to.c_str()) == -1) {
|
||||||
|
@ -358,6 +358,7 @@ static void linkOrCopy(const Path & from, const Path & to)
|
||||||
copyPath(from, to);
|
copyPath(from, to);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
void LocalDerivationGoal::startBuilder()
|
void LocalDerivationGoal::startBuilder()
|
||||||
|
@ -917,7 +918,9 @@ void LocalDerivationGoal::startBuilder()
|
||||||
} else
|
} else
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
|
#if __linux__
|
||||||
fallback:
|
fallback:
|
||||||
|
#endif
|
||||||
pid = startProcess([&]() {
|
pid = startProcess([&]() {
|
||||||
runChild();
|
runChild();
|
||||||
});
|
});
|
||||||
|
|
|
@ -324,6 +324,7 @@ static string quoteRegexChars(const string & raw)
|
||||||
return std::regex_replace(raw, specialRegex, R"(\$&)");
|
return std::regex_replace(raw, specialRegex, R"(\$&)");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined(__linux__)
|
||||||
static void readFileRoots(const char * path, UncheckedRoots & roots)
|
static void readFileRoots(const char * path, UncheckedRoots & roots)
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
|
@ -333,6 +334,7 @@ static void readFileRoots(const char * path, UncheckedRoots & roots)
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
void LocalStore::findRuntimeRoots(Roots & roots, bool censor)
|
void LocalStore::findRuntimeRoots(Roots & roots, bool censor)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue