mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-11-04 10:28:34 +00:00
24 lines
1.1 KiB
Diff
24 lines
1.1 KiB
Diff
Restore that for now, we're not GenToo ...
|
|
|
|
https://reviews.llvm.org/D148945
|
|
https://reviews.llvm.org/D122444
|
|
|
|
Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/Linux.cpp
|
|
===================================================================
|
|
--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Driver/ToolChains/Linux.cpp
|
|
+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/Linux.cpp
|
|
@@ -337,6 +337,13 @@ Linux::Linux(const Driver &D, const llvm
|
|
|
|
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);
|
|
}
|