From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Sat, 4 May 2024 05:30:47 +0000 (+0200)
Subject: D148945-revert
X-Git-Tag: archive/raspbian/1%19.1.3-1+rpi1~1^2^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f7753ee437e53100e52709dff06f9124f78bbbb6;p=llvm-toolchain-19.git

D148945-revert

Restore that for now, we're not GenToo ...

https://reviews.llvm.org/D148945
https://reviews.llvm.org/D122444


Gbp-Pq: Name D148945-revert.diff
---

diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
index 85510edc7d..1522a63686 100644
--- a/clang/lib/Driver/ToolChains/Linux.cpp
+++ b/clang/lib/Driver/ToolChains/Linux.cpp
@@ -333,6 +333,13 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
 
   Generic_GCC::AddMultiarchPaths(D, SysRoot, OSLibDir, Paths);
 
+  // The deprecated -DLLVM_ENABLE_PROJECTS=libcxx configuration installs
+  // libc++.so in D.Dir+"/../lib/". Detect this path.
+  // TODO Remove once LLVM_ENABLE_PROJECTS=libcxx is unsupported.
+  if (StringRef(D.Dir).startswith(SysRoot) &&
+      D.getVFS().exists(D.Dir + "/../lib/libc++.so"))
+    addPathIfExists(D, D.Dir + "/../lib", Paths);
+
   addPathIfExists(D, concat(SysRoot, "/lib"), Paths);
   addPathIfExists(D, concat(SysRoot, "/usr/lib"), Paths);
 }