diff options
| -rw-r--r-- | lib/Driver/Tools.cpp | 2 | ||||
| -rw-r--r-- | lib/Frontend/InitHeaderSearch.cpp | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 629ba07b1d..796b8769e3 100644 --- a/lib/Driver/Tools.cpp +++ b/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/lib/Frontend/InitHeaderSearch.cpp b/lib/Frontend/InitHeaderSearch.cpp index ee4b4eb5cd..7c5f47bc40 100644 --- a/lib/Frontend/InitHeaderSearch.cpp +++ b/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 |