Author: Louis Dionne Date: 2023-04-24T16:44:05-04:00 New Revision: 5084ba395e487adee67ba38cc5c68ff7e052e37c
URL: https://github.com/llvm/llvm-project/commit/5084ba395e487adee67ba38cc5c68ff7e052e37c DIFF: https://github.com/llvm/llvm-project/commit/5084ba395e487adee67ba38cc5c68ff7e052e37c.diff LOG: [clang] Remove workaround for old LLVM_ENABLE_PROJECTS=libcxx build We don't support the LLVM_ENABLE_PROJECTS=libcxx build anymore (and have not for over a year), so it should be fine to remove this workaround now. Differential Revision: https://reviews.llvm.org/D148945 Added: Modified: clang/lib/Driver/ToolChains/Linux.cpp Removed: ################################################################################ diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp index 8ce5a16bfe0d..1fbd26aed596 100644 --- a/clang/lib/Driver/ToolChains/Linux.cpp +++ b/clang/lib/Driver/ToolChains/Linux.cpp @@ -332,13 +332,6 @@ 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); } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
