nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-15 15:02:42 +01:00
Code Activity

Fix more -Wundef, in darwin context

Browse source
This commit is contained in:
Robert Hensing 2025-04-05 00:58:07 +02:00
parent 2b51250534
commit ba89da8fa2
17 changed files with 56 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/filetransfer.cc
View file

@ -13,7 +13,7 @@
#include <aws/core/client/ClientConfiguration.h>
#endif
#if __linux__
#ifdef __linux__
# include "nix/util/namespaces.hh"
#endif
@ -622,7 +622,7 @@ struct curlFileTransfer : public FileTransfer
});
#endif
#if __linux__
#ifdef __linux__
try {
tryUnshareFilesystem();
} catch (nix::Error & e) {

4
src/libstore/gc.cc
View file

@ -335,7 +335,7 @@ static std::string quoteRegexChars(const std::string & raw)
return std::regex_replace(raw, specialRegex, R"(\$&)");
}
#if __linux__
#ifdef __linux__
static void readFileRoots(const std::filesystem::path & path, UncheckedRoots & roots)
{
try {
@ -427,7 +427,7 @@ void LocalStore::findRuntimeRoots(Roots & roots, bool censor)
}
#endif
#if __linux__
#ifdef __linux__
readFileRoots("/proc/sys/kernel/modprobe", unchecked);
readFileRoots("/proc/sys/kernel/fbsplash", unchecked);
readFileRoots("/proc/sys/kernel/poweroff_cmd", unchecked);

8
src/libstore/globals.cc
View file

@ -181,11 +181,11 @@ StringSet Settings::getDefaultSystemFeatures()
actually require anything special on the machines. */
StringSet features{"nixos-test", "benchmark", "big-parallel"};
#if __linux__
#ifdef __linux__
features.insert("uid-range");
#endif
#if __linux__
#ifdef __linux__
if (access("/dev/kvm", R_OK | W_OK) == 0)
features.insert("kvm");
#endif
@ -205,7 +205,7 @@ StringSet Settings::getDefaultExtraPlatforms()
if (std::string{NIX_LOCAL_SYSTEM} == "x86_64-linux" && !isWSL1())
extraPlatforms.insert("i686-linux");
#if __linux__
#ifdef __linux__
StringSet levels = computeLevels();
for (auto iter = levels.begin(); iter != levels.end(); ++iter)
extraPlatforms.insert(*iter + "-linux");
@ -224,7 +224,7 @@ StringSet Settings::getDefaultExtraPlatforms()
bool Settings::isWSL1()
{
#if __linux__
#ifdef __linux__
struct utsname utsbuf;
uname(&utsbuf);
// WSL1 uses -Microsoft suffix

14
src/libstore/include/nix/store/globals.hh
View file

@ -34,7 +34,7 @@ struct MaxBuildJobsSetting : public BaseSetting<unsigned int>
};
const uint32_t maxIdsPerBuild =
#if __linux__
#ifdef __linux__
1 << 16
#else
1
@ -467,7 +467,7 @@ public:
)", {}, true, Xp::AutoAllocateUids};
Setting<uint32_t> startId{this,
#if __linux__
#ifdef __linux__
0x34000000,
#else
56930,
@ -476,7 +476,7 @@ public:
"The first UID and GID to use for dynamic ID allocation."};
Setting<uint32_t> uidCount{this,
#if __linux__
#ifdef __linux__
maxIdsPerBuild * 128,
#else
128,
@ -484,7 +484,7 @@ public:
"id-count",
"The number of UIDs/GIDs to use for dynamic ID allocation."};
#if __linux__
#ifdef __linux__
Setting<bool> useCgroups{
this, false, "use-cgroups",
R"(
@ -596,7 +596,7 @@ public:
Setting<SandboxMode> sandboxMode{
this,
#if __linux__
#ifdef __linux__
smEnabled
#else
smDisabled
@ -671,7 +671,7 @@ public:
)"};
#endif
#if __linux__
#ifdef __linux__
Setting<std::string> sandboxShmSize{
this, "50%", "sandbox-dev-shm-size",
R"(
@ -1066,7 +1066,7 @@ public:
// Don't document the machine-specific default value
false};
#if __linux__
#ifdef __linux__
Setting<bool> filterSyscalls{
this, true, "filter-syscalls",
R"(

4
src/libstore/local-store.cc
View file

@ -38,7 +38,7 @@
# include <grp.h>
#endif
#if __linux__
#ifdef __linux__
# include <sched.h>
# include <sys/statvfs.h>
# include <sys/mount.h>
@ -571,7 +571,7 @@ void LocalStore::upgradeDBSchema(State & state)
bind mount. So make the Nix store writable for this process. */
void LocalStore::makeStoreWritable()
{
#if __linux__
#ifdef __linux__
if (!isRootUser()) return;
/* Check if /nix/store is on a read-only mount. */
struct statvfs stat;

2
src/libstore/store-api.cc
View file

@ -1328,7 +1328,7 @@ ref<Store> openStore(StoreReference && storeURI)
return std::make_shared<LocalStore>(params);
else if (pathExists(settings.nixDaemonSocketFile))
return std::make_shared<UDSRemoteStore>(params);
#if __linux__
#ifdef __linux__
else if (!pathExists(stateDir)
&& params.empty()
&& !isRootUser()

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

@ -42,7 +42,7 @@
#endif
/* Includes required for chroot support. */
#if __linux__
#ifdef __linux__
# include "nix/store/fchmodat2-compat.hh"
# include <sys/ioctl.h>
# include <net/if.h>
@ -418,7 +418,7 @@ LocalDerivationGoal::~LocalDerivationGoal()
inline bool LocalDerivationGoal::needsHashRewrite()
{
#if __linux__
#ifdef __linux__
return !useChroot;
#else
/* Darwin requires hash rewriting even when sandboxing is enabled. */
@ -459,7 +459,7 @@ void LocalDerivationGoal::killChild()
void LocalDerivationGoal::killSandbox(bool getStats)
{
if (cgroup) {
#if __linux__
#ifdef __linux__
auto stats = destroyCgroup(*cgroup);
if (getStats) {
buildResult.cpuUser = stats.cpuUser;
@ -513,14 +513,14 @@ Goal::Co LocalDerivationGoal::tryLocalBuild()
auto & localStore = getLocalStore();
if (localStore.storeDir != localStore.realStoreDir.get()) {
#if __linux__
#ifdef __linux__
useChroot = true;
#else
throw Error("building using a diverted store is not supported on this platform");
#endif
}
#if __linux__
#ifdef __linux__
if (useChroot) {
if (!mountAndPidNamespacesSupported()) {
if (!settings.sandboxFallback)
@ -747,7 +747,7 @@ bool LocalDerivationGoal::cleanupDecideWhetherDiskFull()
}
#if __linux__
#ifdef __linux__
static void doBind(const Path & source, const Path & target, bool optional = false) {
debug("bind mounting '%1%' to '%2%'", source, target);
@ -820,12 +820,12 @@ static void handleChildException(bool sendException)
void LocalDerivationGoal::startBuilder()
{
if ((buildUser && buildUser->getUIDCount() != 1)
#if __linux__
#ifdef __linux__
|| settings.useCgroups
#endif
)
{
#if __linux__
#ifdef __linux__
experimentalFeatureSettings.require(Xp::Cgroups);
/* If we're running from the daemon, then this will return the
@ -1071,7 +1071,7 @@ void LocalDerivationGoal::startBuilder()
pathsInChroot[i] = {i, true};
}
#if __linux__
#ifdef __linux__
/* Create a temporary directory in which we set up the chroot
environment using bind-mounts. We put it in the Nix store
so that the build outputs can be moved efficiently from the
@ -1285,7 +1285,7 @@ void LocalDerivationGoal::startBuilder()
/* Fork a child to build the package. */
#if __linux__
#ifdef __linux__
if (useChroot) {
/* Set up private namespaces for the build:
@ -1482,7 +1482,7 @@ void LocalDerivationGoal::initTmpDir()
{
/* In a sandbox, for determinism, always use the same temporary
directory. */
#if __linux__
#ifdef __linux__
tmpDirInSandbox = useChroot ? settings.sandboxBuildDir : tmpDir;
#else
tmpDirInSandbox = tmpDir;
@ -1728,7 +1728,7 @@ void LocalDerivationGoal::addDependency(const StorePath & path)
debug("materialising '%s' in the sandbox", worker.store.printStorePath(path));
#if __linux__
#ifdef __linux__
Path source = worker.store.Store::toRealPath(path);
Path target = chrootRootDir + worker.store.printStorePath(path);
@ -1778,7 +1778,7 @@ void LocalDerivationGoal::chownToBuilder(const Path & path)
void setupSeccomp()
{
#if __linux__
#ifdef __linux__
if (!settings.filterSyscalls) return;
#if HAVE_SECCOMP
scmp_filter_ctx ctx;
@ -1898,7 +1898,7 @@ void LocalDerivationGoal::runChild()
} catch (SystemError &) { }
}
#if __linux__
#ifdef __linux__
if (useChroot) {
userNamespaceSync.writeSide = -1;
@ -2132,7 +2132,7 @@ void LocalDerivationGoal::runChild()
/* Close all other file descriptors. */
unix::closeExtraFDs();
#if __linux__
#ifdef __linux__
linux::setPersonality(drv->platform);
#endif

6
src/libstore/unix/user-lock.cc
View file

@ -10,7 +10,7 @@
namespace nix {
#if __linux__
#ifdef __linux__
static std::vector<gid_t> get_group_list(const char *username, gid_t group_id)
{
@ -94,7 +94,7 @@ struct SimpleUserLock : UserLock
if (lock->uid == getuid() || lock->uid == geteuid())
throw Error("the Nix user should not be a member of '%s'", settings.buildUsersGroup);
#if __linux__
#ifdef __linux__
/* Get the list of supplementary groups of this user. This is
* usually either empty or contains a group such as "kvm". */
@ -193,7 +193,7 @@ std::unique_ptr<UserLock> acquireUserLock(uid_t nrIds, bool useUserNamespace)
bool useBuildUsers()
{
#if __linux__
#ifdef __linux__
static bool b = (settings.buildUsersGroup != "" || settings.autoAllocateUids) && isRootUser();
return b;
#elif __APPLE__