commit 7693b1021862ea04f522cca9ca1df67bd1d2d54e
author Rafael Espindola <rafael.espindola@gmail.com> Fri Mar 18 15:50:12 2011 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Fri Mar 18 15:50:12 2011 +0000
tree 8495013e12a8a1405af507c3bdeeb73a35f96d22
parent b0a2fcc1e9f621157361341b2aa3b7c780978040

On !Darwin, do use the integrated as with -static.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@127879 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Driver/Driver.cpp

diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index f713fa0..41a0edc 100644
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -1079,7 +1079,9 @@
   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) &&