From e7bbacadb71a06950df8fb77e081334d0f5f081c Mon Sep 17 00:00:00 2001 From: David Nadlinger Date: Mon, 11 Feb 2013 07:24:52 +0100 Subject: [PATCH] Removed useless -quiet switch. --- driver/linker.cpp | 17 ++++------------- driver/linker.h | 4 ---- driver/main.cpp | 3 --- 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/driver/linker.cpp b/driver/linker.cpp index aa259032..056dcbb6 100644 --- a/driver/linker.cpp +++ b/driver/linker.cpp @@ -27,15 +27,6 @@ ////////////////////////////////////////////////////////////////////////////// -// Is this useful? -llvm::cl::opt quiet("quiet", - llvm::cl::desc("Suppress output of link command (unless -v is also passed)"), - llvm::cl::Hidden, - llvm::cl::ZeroOrMore, - llvm::cl::init(true)); - -////////////////////////////////////////////////////////////////////////////// - static bool endsWith(const std::string &str, const std::string &end) { return (str.length() >= end.length() && std::equal(end.rbegin(), end.rend(), str.rbegin())); @@ -210,7 +201,7 @@ static int linkObjToBinaryGcc(bool sharedLib) logstr << "\n"; // FIXME where's flush ? // try to call linker - return executeToolAndWait(gcc, args, !quiet || global.params.verbose); + return executeToolAndWait(gcc, args, global.params.verbose); } ////////////////////////////////////////////////////////////////////////////// @@ -316,7 +307,7 @@ static int linkObjToBinaryWin(bool sharedLib) logstr << "\n"; // FIXME where's flush ? // try to call linker - return executeToolAndWait(tool, args, !quiet || global.params.verbose); + return executeToolAndWait(tool, args, global.params.verbose); } ////////////////////////////////////////////////////////////////////////////// @@ -393,7 +384,7 @@ void createStaticLibrary() CreateDirectoryOnDisk(libName); // try to call archiver - executeToolAndWait(tool, args, !quiet || global.params.verbose); + executeToolAndWait(tool, args, global.params.verbose); } ////////////////////////////////////////////////////////////////////////////// @@ -417,7 +408,7 @@ int runExecutable() assert(gExePath.isValid()); // Run executable - int status = executeToolAndWait(gExePath, opts::runargs, !quiet || global.params.verbose); + int status = executeToolAndWait(gExePath, opts::runargs, global.params.verbose); if (status < 0) { #if defined(_MSC_VER) diff --git a/driver/linker.h b/driver/linker.h index 38fa66d8..7b503e7f 100644 --- a/driver/linker.h +++ b/driver/linker.h @@ -15,10 +15,6 @@ #ifndef LDC_DRIVER_LINKER_H #define LDC_DRIVER_LINKER_H -#include "llvm/Support/CommandLine.h" - -extern llvm::cl::opt quiet; - /** * Link an executable only from object files. * @param argv0 the argv[0] value as passed to main diff --git a/driver/main.cpp b/driver/main.cpp index babbac54..608fbb17 100644 --- a/driver/main.cpp +++ b/driver/main.cpp @@ -387,9 +387,6 @@ int main(int argc, char** argv) } } - if (global.params.run) - quiet = 1; - if (global.params.useUnitTests) global.params.useAssert = 1;