diff options
Diffstat (limited to 'clang/lib/Driver/Driver.cpp')
| -rw-r--r-- | clang/lib/Driver/Driver.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index 75300b5307e..a4aa2ed0250 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -1225,17 +1225,9 @@ static const Tool &SelectToolForJob(Compilation &C, const ToolChain *TC, // bottom up, so what we are actually looking for is an assembler job with a // compiler input. - // FIXME: This doesn't belong here, but ideally we will support static soon - // anyway. - bool HasStatic = (C.getArgs().hasArg(options::OPT_mkernel) || - C.getArgs().hasArg(options::OPT_static) || - C.getArgs().hasArg(options::OPT_fapple_kext)); - bool IsDarwin = TC->getTriple().isOSDarwin(); - bool IsIADefault = TC->IsIntegratedAssemblerDefault() && - !(HasStatic && IsDarwin); if (C.getArgs().hasFlag(options::OPT_integrated_as, - options::OPT_no_integrated_as, - IsIADefault) && + options::OPT_no_integrated_as, + TC->IsIntegratedAssemblerDefault()) && !C.getArgs().hasArg(options::OPT_save_temps) && isa<AssembleJobAction>(JA) && Inputs->size() == 1 && isa<CompileJobAction>(*Inputs->begin())) { |
