commit b622959527c07cc6b68739eac1412f75f0ca77fa
author David Chisnall <csdavec@swan.ac.uk> Wed Feb 15 18:24:31 2012 +0000
committer David Chisnall <csdavec@swan.ac.uk> Wed Feb 15 18:24:31 2012 +0000
tree d1576f0911c70caf0e7600578b02fe8a29cc1e9c
parent d226e5cbbf0e5285bda065741655e0e976ed91b9

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



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@150602 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Driver/Tools.cpp

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index 629ba07..796b876 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -4271,7 +4271,7 @@
   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");
 

lib/Frontend/InitHeaderSearch.cpp

diff --git a/lib/Frontend/InitHeaderSearch.cpp b/lib/Frontend/InitHeaderSearch.cpp
index ee4b4eb..7c5f47b 100644
--- a/lib/Frontend/InitHeaderSearch.cpp
+++ b/lib/Frontend/InitHeaderSearch.cpp
@@ -415,6 +415,15 @@
                                 "", "", "", 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