diff options
Diffstat (limited to 'src/libstore/globals.cc')
| -rw-r--r-- | src/libstore/globals.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index 0f2ca4b15..d724897bb 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -114,7 +114,13 @@ std::vector<Path> getUserConfigFiles() unsigned int Settings::getDefaultCores() { - return std::max(1U, std::thread::hardware_concurrency()); + const unsigned int concurrency = std::max(1U, std::thread::hardware_concurrency()); + const unsigned int maxCPU = getMaxCPU(); + + if (maxCPU > 0) + return maxCPU; + else + return concurrency; } StringSet Settings::getDefaultSystemFeatures() |