diff options
| author | Matthew Voss <matthew.voss@sony.com> | 2019-03-08 20:33:55 +0000 |
|---|---|---|
| committer | Matthew Voss <matthew.voss@sony.com> | 2019-03-08 20:33:55 +0000 |
| commit | 1262e52e1623b126ecaf4f2dc1b561f3f71c30de (patch) | |
| tree | 7d558bb2cfc19db82228b03d61f1035877ebf128 /clang/lib/Driver/ToolChains/Linux.cpp | |
| parent | 74c9c305e095e44c311ff15428ccbb1fc6949302 (diff) | |
| download | bcm5719-llvm-1262e52e1623b126ecaf4f2dc1b561f3f71c30de.tar.gz bcm5719-llvm-1262e52e1623b126ecaf4f2dc1b561f3f71c30de.zip | |
Revert "[runtimes] Move libunwind, libc++abi and libc++ to lib/ and include/"
This broke the windows bots.
This reverts commit 28302c66d2586074f77497d5dc4eac7182b679e0.
llvm-svn: 355725
Diffstat (limited to 'clang/lib/Driver/ToolChains/Linux.cpp')
| -rw-r--r-- | clang/lib/Driver/ToolChains/Linux.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp index 4ef9ee69511..64631781117 100644 --- a/clang/lib/Driver/ToolChains/Linux.cpp +++ b/clang/lib/Driver/ToolChains/Linux.cpp @@ -880,6 +880,7 @@ void Linux::addLibCxxIncludePaths(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const { const std::string& SysRoot = computeSysRoot(); const std::string LibCXXIncludePathCandidates[] = { + DetectLibcxxIncludePath(getDriver().ResourceDir + "/include/c++"), DetectLibcxxIncludePath(getDriver().Dir + "/../include/c++"), // If this is a development, non-installed, clang, libcxx will // not be found at ../include/c++ but it likely to be found at |
