From 750be19ae865da3ee03c132a287148f2402ad72b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 4 Aug 2010 12:23:59 +0000 Subject: * Remove "auto" and "guess" as synonyms for 0 in the handling of build-cores and --cores. They're superfluous and just complicate the parsing. --- src/libmain/shared.cc | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'src/libmain/shared.cc') diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index 19aa1e71cc..eddc4e64b3 100644 --- a/src/libmain/shared.cc +++ b/src/libmain/shared.cc @@ -135,12 +135,7 @@ static void initAndRun(int argc, char * * argv) /* Get some settings from the configuration file. */ thisSystem = querySetting("system", SYSTEM); maxBuildJobs = queryIntSetting("build-max-jobs", 1); - string tmp = querySetting("build-cores", "/UNDEFINED"); - std::transform(tmp.begin(), tmp.end(), tmp.begin(), tolower); - if (tmp == "auto" || tmp == "guess") - buildCores = 0; - else - buildCores = queryIntSetting("build-cores", 1); + buildCores = queryIntSetting("build-cores", 1); maxSilentTime = queryIntSetting("build-max-silent-time", 0); /* Catch SIGINT. */ @@ -232,14 +227,8 @@ static void initAndRun(int argc, char * * argv) tryFallback = true; else if (arg == "--max-jobs" || arg == "-j") maxBuildJobs = getIntArg(arg, i, args.end()); - else if (arg == "--cores") { - string tmp = *(++i); - std::transform(tmp.begin(), tmp.end(), tmp.begin(), tolower); - if (tmp == "auto" || tmp == "guess") - buildCores = 0u; - else - buildCores = getIntArg(arg, --i, args.end()); - } + else if (arg == "--cores") + buildCores = getIntArg(arg, i, args.end()); else if (arg == "--readonly-mode") readOnlyMode = true; else if (arg == "--max-silent-time") -- cgit 1.4.1