diff options
Diffstat (limited to 'lib/Driver')
| -rw-r--r-- | lib/Driver/Driver.cpp | 2 | ||||
| -rw-r--r-- | lib/Driver/ToolChains.cpp | 17 |
2 files changed, 3 insertions, 16 deletions
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index 4fc6db980c..9881bbaca3 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -58,7 +58,7 @@ Driver::Driver(StringRef ClangExecutable, CCCIsCPP(false),CCCEcho(false), CCCPrintBindings(false), CCPrintOptions(false), CCPrintHeaders(false), CCLogDiagnostics(false), CCGenDiagnostics(false), CCCGenericGCCName(""), CheckInputsExist(true), - ForcedClangUse(false), CCCUsePCH(true), SuppressMissingInputWarning(false) { + CCCUsePCH(true), SuppressMissingInputWarning(false) { Name = llvm::sys::path::stem(ClangExecutable); Dir = llvm::sys::path::parent_path(ClangExecutable); diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 149b8a1f34..e5fbc52dc0 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -183,24 +183,11 @@ void Generic_ELF::anchor() {} Tool &Darwin::SelectTool(const Compilation &C, const JobAction &JA, const ActionList &Inputs) const { Action::ActionClass Key = JA.getKind(); - bool useClang = false; if (getDriver().ShouldUseClangCompiler(C, JA, getTriple())) { - useClang = true; - // Fallback to llvm-gcc for i386 kext compiles, we don't support that ABI. - if (!getDriver().shouldForceClangUse() && - Inputs.size() == 1 && - types::isCXX(Inputs[0]->getType()) && - getTriple().isOSDarwin() && - getTriple().getArch() == llvm::Triple::x86 && - (C.getArgs().getLastArg(options::OPT_fapple_kext) || - C.getArgs().getLastArg(options::OPT_mkernel))) - useClang = false; - } - - // FIXME: This seems like a hacky way to choose clang frontend. - if (useClang) + // FIXME: This seems like a hacky way to choose clang frontend. Key = Action::AnalyzeJobClass; + } bool UseIntegratedAs = C.getArgs().hasFlag(options::OPT_integrated_as, options::OPT_no_integrated_as, |