[llvm-branch-commits] [cfe-branch] r143955 - in /cfe/branches/release_30: ./ lib/Driver/ToolChains.cpp

[Chandler Carruth]

Author: chandlerc
Date: Mon Nov  7 04:44:38 2011
New Revision: 143955

URL: http://llvm.org/viewvc/llvm-project?rev=143955&view=rev
Log:
Merging r143916:
------------------------------------------------------------------------
r143916 | chandlerc | 2011-11-07 01:01:17 -0800 (Mon, 07 Nov 2011) | 4 lines

Fix Linux libc++ usage. Somehow this slipped through during the port.

Test cases for this and all the rest of the port are still in the works,
but will wait for a fixed computer and post 3.0 merging...
------------------------------------------------------------------------

Modified:
    cfe/branches/release_30/   (props changed)
    cfe/branches/release_30/lib/Driver/ToolChains.cpp

Propchange: cfe/branches/release_30/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov  7 04:44:38 2011
@@ -1,3 +1,3 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:142113,142133-142134,142187,142349,142474,142476,142918,143344-143345,143684,143686-143687,143751-143752,143798,143801,143804-143807,143822-143823,143836,143838-143842,143863,143866,143869,143871,143873-143875,143896-143897
+/cfe/trunk:142113,142133-142134,142187,142349,142474,142476,142918,143344-143345,143684,143686-143687,143751-143752,143798,143801,143804-143807,143822-143823,143836,143838-143842,143863,143866,143869,143871,143873-143875,143896-143897,143916
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_30/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_30/lib/Driver/ToolChains.cpp?rev=143955&r1=143954&r2=143955&view=diff
==============================================================================
--- cfe/branches/release_30/lib/Driver/ToolChains.cpp (original)
+++ cfe/branches/release_30/lib/Driver/ToolChains.cpp Mon Nov  7 04:44:38 2011
@@ -2017,6 +2017,14 @@
       DriverArgs.hasArg(options::OPT_nostdincxx))
     return;
 
+  // Check if libc++ has been enabled and provide its include paths if so.
+  if (GetCXXStdlibType(DriverArgs) == ToolChain::CST_Libcxx) {
+    // libc++ is always installed at a fixed path on Linux currently.
+    addSystemInclude(DriverArgs, CC1Args,
+                     getDriver().SysRoot + "/usr/include/c++/v1");
+    return;
+  }
+
   const llvm::Triple &TargetTriple = getTriple();
   const llvm::Triple::ArchType TargetArch = TargetTriple.getArch();
   bool IsTarget64Bit = (TargetArch == llvm::Triple::x86_64 ||