ldionne created this revision. Herald added a project: All. ldionne requested review of this revision. Herald added subscribers: cfe-commits, MaskRay. Herald added a project: clang.
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. Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D148945 Files: clang/lib/Driver/ToolChains/Linux.cpp Index: clang/lib/Driver/ToolChains/Linux.cpp =================================================================== --- clang/lib/Driver/ToolChains/Linux.cpp +++ clang/lib/Driver/ToolChains/Linux.cpp @@ -299,13 +299,6 @@ 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); }
Index: clang/lib/Driver/ToolChains/Linux.cpp =================================================================== --- clang/lib/Driver/ToolChains/Linux.cpp +++ clang/lib/Driver/ToolChains/Linux.cpp @@ -299,13 +299,6 @@ 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