Add some Solaris include paths and fix a -lgcc_eh that apparently should be -lgcc_s.

llvm-svn: 150602
This commit is contained in:
David Chisnall
2012-02-15 18:24:31 +00:00
parent 4736aee81e
commit 1026fb0797
2 changed files with 10 additions and 1 deletions

View File

@@ -4271,7 +4271,7 @@ void solaris::Link::ConstructJob(Compilation &C, const JobAction &JA,
if (!Args.hasArg(options::OPT_nostdlib) &&
!Args.hasArg(options::OPT_nodefaultlibs)) {
CmdArgs.push_back("-lgcc");
CmdArgs.push_back("-lgcc_eh");
CmdArgs.push_back("-lgcc_s");
if (!Args.hasArg(options::OPT_shared))
CmdArgs.push_back("-lc");

View File

@@ -415,6 +415,15 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp
"", "", "", triple);
break;
case llvm::Triple::Solaris:
AddGnuCPlusPlusIncludePaths("/usr/gcc/4.5/include/c++/4.5.2/",
"i386-pc-solaris2.11", "", "", triple);
AddGnuCPlusPlusIncludePaths(
"/usr/gcc/4.5/lib/gcc/i386-pc-solaris2.11/4.5.2/include",
"", "", "", triple);
AddGnuCPlusPlusIncludePaths(
"/usr/gcc/4.5/lib/gcc/i386-pc-solaris2.11/4.5.2/include-fixed",
"", "", "", triple);
// Solaris - Fall though..
case llvm::Triple::AuroraUX:
// AuroraUX