diff options
| author | Arthur Eubanks <aeubanks@google.com> | 2024-04-10 23:41:51 +0000 |
|---|---|---|
| committer | Arthur Eubanks <aeubanks@google.com> | 2024-04-10 23:41:51 +0000 |
| commit | be10070f91b86a6f126d2451852242bfcb2cd366 (patch) | |
| tree | 87e432687b155011486cb0a50b9c1101c7da4571 /clang/lib | |
| parent | 9786a3b4cf9d050a6f87358e3295da3d32fade5c (diff) | |
| download | llvm-be10070f91b86a6f126d2451852242bfcb2cd366.zip llvm-be10070f91b86a6f126d2451852242bfcb2cd366.tar.gz llvm-be10070f91b86a6f126d2451852242bfcb2cd366.tar.bz2 | |
Revert "[Driver] Ensure ToolChain::LibraryPaths is not empty for non-Darwin"
This reverts commit ccdebbae4d77d3efc236af92c22941de5d437e01.
Causes test failures in the presence of Android runtime libraries in resource-dir.
See comments on https://github.com/llvm/llvm-project/pull/87866.
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Driver/ToolChain.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp index 237092e..03450fc 100644 --- a/clang/lib/Driver/ToolChain.cpp +++ b/clang/lib/Driver/ToolChain.cpp @@ -796,13 +796,7 @@ ToolChain::getTargetSubDirPath(StringRef BaseDir) const { std::optional<std::string> ToolChain::getRuntimePath() const { SmallString<128> P(D.ResourceDir); llvm::sys::path::append(P, "lib"); - if (auto Ret = getTargetSubDirPath(P)) - return Ret; - // Darwin does not use per-target runtime directory. - if (Triple.isOSDarwin()) - return {}; - llvm::sys::path::append(P, Triple.str()); - return std::string(P); + return getTargetSubDirPath(P); } std::optional<std::string> ToolChain::getStdlibPath() const { |