diff options
| author | David Chisnall <csdavec@swan.ac.uk> | 2012-03-13 14:14:54 +0000 |
|---|---|---|
| committer | David Chisnall <csdavec@swan.ac.uk> | 2012-03-13 14:14:54 +0000 |
| commit | e6dd683d99b14ff8cd886cd81e6588cd1883ca52 (patch) | |
| tree | fce189e764c15d574f293b5a5a2d6848de1df9d9 /lib/Driver | |
| parent | 9cda03ff7fc40b727d0cc44b1702dbae09d63f42 (diff) | |
Tweak linkage order for solaris.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@152627 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Driver')
| -rw-r--r-- | lib/Driver/Tools.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index acd8b3a945..4c05424192 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -4301,11 +4301,12 @@ void solaris::Link::ConstructJob(Compilation &C, const JobAction &JA, CmdArgs.push_back(Args.MakeArgString(LibPath + "values-Xa.o")); CmdArgs.push_back(Args.MakeArgString(GCCLibPath + "crtbegin.o")); } else { - CmdArgs.push_back(Args.MakeArgString(LibPath + "cxa_finalize.o")); CmdArgs.push_back(Args.MakeArgString(LibPath + "crti.o")); CmdArgs.push_back(Args.MakeArgString(LibPath + "values-Xa.o")); CmdArgs.push_back(Args.MakeArgString(GCCLibPath + "crtbegin.o")); } + if (getToolChain().getDriver().CCCIsCXX) + CmdArgs.push_back(Args.MakeArgString(LibPath + "cxa_finalize.o")); } CmdArgs.push_back(Args.MakeArgString("-L" + GCCLibPath)); |