diff options
| author | David Chisnall <csdavec@swan.ac.uk> | 2012-02-15 18:24:31 +0000 |
|---|---|---|
| committer | David Chisnall <csdavec@swan.ac.uk> | 2012-02-15 18:24:31 +0000 |
| commit | 1026fb07976b5f7c83fc26a1644ba2318bfdfd66 (patch) | |
| tree | 6e7ac64a4497cd6f30a5495385968d81519d372c | |
| parent | 4736aee81e906e2e8062094f3aa01571e7e9b137 (diff) | |
| download | bcm5719-llvm-1026fb07976b5f7c83fc26a1644ba2318bfdfd66.tar.gz bcm5719-llvm-1026fb07976b5f7c83fc26a1644ba2318bfdfd66.zip | |
Add some Solaris include paths and fix a -lgcc_eh that apparently should be -lgcc_s.
llvm-svn: 150602
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Frontend/InitHeaderSearch.cpp | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 629ba07b1d3..796b8769e3b 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -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"); diff --git a/clang/lib/Frontend/InitHeaderSearch.cpp b/clang/lib/Frontend/InitHeaderSearch.cpp index ee4b4eb5cd3..7c5f47bc408 100644 --- a/clang/lib/Frontend/InitHeaderSearch.cpp +++ b/clang/lib/Frontend/InitHeaderSearch.cpp @@ -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 |
