commit 9295df056971230934aaed55f5a5d3b65c47e952
author Douglas Gregor <dgregor@apple.com> Tue May 15 21:00:27 2012 +0000
committer Douglas Gregor <dgregor@apple.com> Tue May 15 21:00:27 2012 +0000
tree bde334b810e3879c3c5ebc11375593dedf7ea0be
parent a548587d484c51d7616dbe86f62a546eca16b822

Add the Objective-C runtime linking arguments after user-specified
linker arguments. Fixes <rdar://problem/11417441>. 

llvm-svn: 156853

clang/lib/Driver/Tools.cpp

diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index bed29ab..887c64c 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -4224,6 +4224,8 @@
     // This is more complicated in gcc...
     CmdArgs.push_back("-lgomp");
 
+  AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs);
+  
   if (isObjCRuntimeLinked(Args) &&
       !Args.hasArg(options::OPT_nostdlib) &&
       !Args.hasArg(options::OPT_nodefaultlibs)) {
@@ -4246,8 +4248,6 @@
     CmdArgs.push_back("-lobjc");
   }
 
-  AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs);
-
   if (LinkingOutput) {
     CmdArgs.push_back("-arch_multiple");
     CmdArgs.push_back("-final_output");