[PATCH] D110663: [Driver] Support Debian multiarch style lib/clang/14.0.0/x86_64-linux-gnu runtime path and include/x86_64-linux-gnu/c++/v1 libc++ path

[Fangrui Song via Phabricator via cfe-commits]

MaskRay added a comment.

On top on this Diff, with the following patch, `ninja check-clang-driver` passes. We may consider dropping the normalized triple code.

  --- i/clang/lib/Driver/ToolChain.cpp
  +++ w/clang/lib/Driver/ToolChain.cpp
  @@ -494,6 +494,7 @@ std::string ToolChain::getRuntimePath() const {
     // "x86_64-linux-gnu" (no vendor part).
     SmallString<128> P;
     llvm::sys::path::append(P, D.ResourceDir, "lib", D.getTargetTriple());
  +  return std::string(P);
     if (getVFS().exists(P))
       return std::string(P);
   
  @@ -506,6 +507,7 @@ std::string ToolChain::getStdlibPath() const {
     SmallString<128> P;
     // First try the unnormalized triple a la getRuntimePath().
     llvm::sys::path::append(P, D.Dir, "..", "lib", D.getTargetTriple());
  +  return std::string(P);
     if (getVFS().exists(P))
       return std::string(P);
   


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D110663/new/

https://reviews.llvm.org/D110663