aboutsummaryrefslogtreecommitdiff
path: root/clang/lib/Driver/ToolChain.cpp
diff options
context:
space:
mode:
authorRyan Prichard <rprichard@google.com>2020-06-10 17:08:04 -0700
committerRyan Prichard <rprichard@google.com>2020-06-17 16:17:37 -0700
commit6c4ce202267ee089e611b7bee1dc4f3eb07ba23d (patch)
tree194f5b6cf78e429feddf30fb2e09f071c4c8001c /clang/lib/Driver/ToolChain.cpp
parent5f5f566b265db00f577ead268400d99f34ba9cdd (diff)
downloadllvm-6c4ce202267ee089e611b7bee1dc4f3eb07ba23d.zip
llvm-6c4ce202267ee089e611b7bee1dc4f3eb07ba23d.tar.gz
llvm-6c4ce202267ee089e611b7bee1dc4f3eb07ba23d.tar.bz2
[Driver] Search computed sysroot for libc++ header paths
Summary: The Android NDK's clang driver is used with an Android -target setting, and the driver automatically finds the Android sysroot at a path relative to the driver. The sysroot has the libc++ headers in it. Remove Hurd::computeSysRoot as it is equivalent to the new ToolChain::computeSysRoot method. Fixes PR46213. Reviewers: srhines, danalbert, #libc, kristina Reviewed By: srhines, danalbert Subscribers: ldionne, sthibaul, asb, rbar, johnrusso, simoncook, sabuasal, niosHD, jrtc27, MaskRay, zzheng, edward-jones, rogfer01, MartinMosbeck, brucehoult, the_o, PkmX, jocewei, Jim, lenary, s.egerton, pzheng, sameer.abuasal, apazos, luismarques, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D81622
Diffstat (limited to 'clang/lib/Driver/ToolChain.cpp')
-rw-r--r--clang/lib/Driver/ToolChain.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
index 2bda7de..c21bc0d 100644
--- a/clang/lib/Driver/ToolChain.cpp
+++ b/clang/lib/Driver/ToolChain.cpp
@@ -750,6 +750,10 @@ std::string ToolChain::ComputeEffectiveClangTriple(const ArgList &Args,
return ComputeLLVMTriple(Args, InputType);
}
+std::string ToolChain::computeSysRoot() const {
+ return D.SysRoot;
+}
+
void ToolChain::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
ArgStringList &CC1Args) const {
// Each toolchain should provide the appropriate include flags.