From 34fa8ce9179b17cc4cd13ae49b69fccf393271a0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Sat, 15 Jun 2019 16:34:06 +0200
Subject: [PATCH] nix: Support -j flag
---
src/libmain/common-args.cc | 9 +++++++++
src/libmain/shared.cc | 4 ----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/libmain/common-args.cc b/src/libmain/common-args.cc
index 4c35a4199..9e1d7cee6 100644
--- a/src/libmain/common-args.cc
+++ b/src/libmain/common-args.cc
@@ -35,6 +35,15 @@ MixCommonArgs::MixCommonArgs(const string & programName)
}
});
+ mkFlag()
+ .longName("max-jobs")
+ .shortName('j')
+ .label("jobs")
+ .description("maximum number of parallel builds")
+ .handler([=](std::string s) {
+ settings.set("max-jobs", s);
+ });
+
std::string cat = "config";
globalConfig.convertToArgs(*this, cat);
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc
index 4ed34e54d..cd752f467 100644
--- a/src/libmain/shared.cc
+++ b/src/libmain/shared.cc
@@ -175,10 +175,6 @@ LegacyArgs::LegacyArgs(const std::string & programName,
.description("build from source if substitution fails")
.set(&(bool&) settings.tryFallback, true);
- mkFlag1('j', "max-jobs", "jobs", "maximum number of parallel builds", [=](std::string s) {
- settings.set("max-jobs", s);
- });
-
auto intSettingAlias = [&](char shortName, const std::string & longName,
const std::string & description, const std::string & dest) {
mkFlag<unsigned int>(shortName, longName, description, [=](unsigned int n) {
--
GitLab