philiptaron/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #5608 from tweag/fix-build-warnings-on-macos

Browse source 
Fix build warnings on MacOS
This commit is contained in:
Théophane Hufschmitt 2021-11-22 14:17:31 +01:00 committed by GitHub
parent 9cd8cffefc db2e4489a5
commit 800e6e8194
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libstore/build/local-derivation-goal.cc
View file

@ -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();
}); });

4
src/libstore/gc.cc
View file

@ -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 __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)
{ {
@ -414,7 +416,7 @@ void LocalStore::findRuntimeRoots(Roots & roots, bool censor)
} }
#endif #endif
#if defined(__linux__) #if __linux__
readFileRoots("/proc/sys/kernel/modprobe", unchecked); readFileRoots("/proc/sys/kernel/modprobe", unchecked);
readFileRoots("/proc/sys/kernel/fbsplash", unchecked); readFileRoots("/proc/sys/kernel/fbsplash", unchecked);
readFileRoots("/proc/sys/kernel/poweroff_cmd", unchecked); readFileRoots("/proc/sys/kernel/poweroff_cmd", unchecked);