diff options
| -rw-r--r-- | clang/examples/clang-interpreter/main.cpp | 3 | ||||
| -rw-r--r-- | clang/include/clang/Driver/Driver.h | 2 | ||||
| -rw-r--r-- | clang/lib/Driver/Driver.cpp | 5 | ||||
| -rw-r--r-- | clang/lib/Frontend/CreateInvocationFromCommandLine.cpp | 2 | ||||
| -rw-r--r-- | clang/tools/driver/Makefile | 9 | ||||
| -rw-r--r-- | clang/tools/driver/driver.cpp | 9 |
6 files changed, 5 insertions, 25 deletions
diff --git a/clang/examples/clang-interpreter/main.cpp b/clang/examples/clang-interpreter/main.cpp index 8eca4454df5..c04f2b5f251 100644 --- a/clang/examples/clang-interpreter/main.cpp +++ b/clang/examples/clang-interpreter/main.cpp @@ -76,8 +76,7 @@ int main(int argc, const char **argv, char * const *envp) { llvm::IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs()); DiagnosticsEngine Diags(DiagID, DiagClient); Driver TheDriver(Path.str(), llvm::sys::getHostTriple(), - "a.out", /*IsProduction=*/false, /*CXXIsProduction=*/false, - Diags); + "a.out", /*IsProduction=*/false, Diags); TheDriver.setTitle("clang interpreter"); // FIXME: This is a hack to try to force the driver to do something we can diff --git a/clang/include/clang/Driver/Driver.h b/clang/include/clang/Driver/Driver.h index 549893e6bf8..6fdf6fcfad6 100644 --- a/clang/include/clang/Driver/Driver.h +++ b/clang/include/clang/Driver/Driver.h @@ -189,7 +189,7 @@ public: Driver(StringRef _ClangExecutable, StringRef _DefaultHostTriple, StringRef _DefaultImageName, - bool IsProduction, bool CXXIsProduction, + bool IsProduction, DiagnosticsEngine &_Diags); ~Driver(); diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index 6f49bec01bf..e9ab78ddcba 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -49,7 +49,7 @@ using namespace clang; Driver::Driver(StringRef ClangExecutable, StringRef DefaultHostTriple, StringRef DefaultImageName, - bool IsProduction, bool CXXIsProduction, + bool IsProduction, DiagnosticsEngine &Diags) : Opts(createDriverOptTable()), Diags(Diags), ClangExecutable(ClangExecutable), UseStdLib(true), @@ -73,9 +73,6 @@ Driver::Driver(StringRef ClangExecutable, CCCClangArchs.insert(llvm::Triple::x86); CCCClangArchs.insert(llvm::Triple::x86_64); CCCClangArchs.insert(llvm::Triple::arm); - - if (!CXXIsProduction) - CCCUseClangCXX = false; } Name = llvm::sys::path::stem(ClangExecutable); diff --git a/clang/lib/Frontend/CreateInvocationFromCommandLine.cpp b/clang/lib/Frontend/CreateInvocationFromCommandLine.cpp index ccfa865233f..fc1508103c2 100644 --- a/clang/lib/Frontend/CreateInvocationFromCommandLine.cpp +++ b/clang/lib/Frontend/CreateInvocationFromCommandLine.cpp @@ -49,7 +49,7 @@ clang::createInvocationFromCommandLine(ArrayRef<const char *> ArgList, // FIXME: We shouldn't have to pass in the path info. driver::Driver TheDriver("clang", llvm::sys::getHostTriple(), - "a.out", false, false, *Diags); + "a.out", false, *Diags); // Don't check that inputs exist, they may have been remapped. TheDriver.setCheckInputsExist(false); diff --git a/clang/tools/driver/Makefile b/clang/tools/driver/Makefile index 1ba8bc24d1f..6b34a991bf1 100644 --- a/clang/tools/driver/Makefile +++ b/clang/tools/driver/Makefile @@ -9,13 +9,7 @@ CLANG_LEVEL := ../.. TOOLNAME = clang -ifndef CLANG_IS_PRODUCTION TOOLALIAS = clang++ -else - ifdef CLANGXX_IS_PRODUCTION - TOOLALIAS = clang++ - endif -endif # We don't currently expect production Clang builds to be interested in # plugins. This is important for startup performance. @@ -73,6 +67,3 @@ endif ifdef CLANG_IS_PRODUCTION CPP.Defines += -DCLANG_IS_PRODUCTION endif -ifdef CLANGXX_IS_PRODUCTION -CPP.Defines += -DCLANGXX_IS_PRODUCTION -endif diff --git a/clang/tools/driver/driver.cpp b/clang/tools/driver/driver.cpp index b9268dfeb4f..bd1d2a2f5f3 100644 --- a/clang/tools/driver/driver.cpp +++ b/clang/tools/driver/driver.cpp @@ -379,18 +379,11 @@ int main(int argc_, const char **argv_) { #ifdef CLANG_IS_PRODUCTION const bool IsProduction = true; -# ifdef CLANGXX_IS_PRODUCTION - const bool CXXIsProduction = true; -# else - const bool CXXIsProduction = false; -# endif #else const bool IsProduction = false; - const bool CXXIsProduction = false; #endif Driver TheDriver(Path.str(), llvm::sys::getHostTriple(), - "a.out", IsProduction, CXXIsProduction, - Diags); + "a.out", IsProduction, Diags); // Attempt to find the original path used to invoke the driver, to determine // the installed path. We do this manually, because we want to support that |
