Commit de9c697e authored by Chandler Carruth's avatar Chandler Carruth
Browse files

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...
------------------------------------------------------------------------

llvm-svn: 143955
parent 02591c29

clang/lib/Driver/ToolChains.cpp

+8 −0
Original line number Diff line number Diff line
@@ -2017,6 +2017,14 @@ void Linux::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs, 
      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 ||