From 9295df056971230934aaed55f5a5d3b65c47e952 Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Tue, 15 May 2012 21:00:27 +0000 Subject: Add the Objective-C runtime linking arguments after user-specified linker arguments. Fixes . llvm-svn: 156853 --- clang/lib/Driver/Tools.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'clang/lib/Driver/Tools.cpp') diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index bed29abd82c..887c64cff03 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -4224,6 +4224,8 @@ void darwin::Link::ConstructJob(Compilation &C, const JobAction &JA, // 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 @@ void darwin::Link::ConstructJob(Compilation &C, const JobAction &JA, CmdArgs.push_back("-lobjc"); } - AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs); - if (LinkingOutput) { CmdArgs.push_back("-arch_multiple"); CmdArgs.push_back("-final_output"); -- cgit v1.2.3