diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2011-03-18 15:50:12 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2011-03-18 15:50:12 +0000 |
| commit | 6b314b3d9456f5aa71f0a41d07f92f8c368cb182 (patch) | |
| tree | 9b24e1be759a6e19e69b0c87970385cef7e77c38 /clang/lib/Driver/Driver.cpp | |
| parent | a3088e65688f2a1c95004c7a1b3cf2bb0fb79c00 (diff) | |
| download | bcm5719-llvm-6b314b3d9456f5aa71f0a41d07f92f8c368cb182.tar.gz bcm5719-llvm-6b314b3d9456f5aa71f0a41d07f92f8c368cb182.zip | |
On !Darwin, do use the integrated as with -static.
llvm-svn: 127879
Diffstat (limited to 'clang/lib/Driver/Driver.cpp')
| -rw-r--r-- | clang/lib/Driver/Driver.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index f713fa0b3bd..41a0edc2ba3 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -1079,7 +1079,9 @@ static const Tool &SelectToolForJob(Compilation &C, const ToolChain *TC, bool HasStatic = (C.getArgs().hasArg(options::OPT_mkernel) || C.getArgs().hasArg(options::OPT_static) || C.getArgs().hasArg(options::OPT_fapple_kext)); - bool IsIADefault = (TC->IsIntegratedAssemblerDefault() && !HasStatic); + bool IsDarwin = TC->getTriple().getOS() == llvm::Triple::Darwin; + bool IsIADefault = TC->IsIntegratedAssemblerDefault() && + !(HasStatic && IsDarwin); if (C.getArgs().hasFlag(options::OPT_integrated_as, options::OPT_no_integrated_as, IsIADefault) && |
