Hi Fangrui, This change seems to have broken the link on Android: https://lab.llvm.org/buildbot/#/builders/77/builds/4777 Could you please take a look?
ld.lld: error: /var/lib/buildbot/sanitizer-buildbot6/sanitizer-x86_64-linux-android/build/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/lib/gcc/aarch64-linux-android/4.9.x/../../../../lib64/libc++.so is incompatible with aarch64linux On Sat, Mar 20, 2021 at 9:38 PM Fangrui Song via cfe-commits < cfe-commits@lists.llvm.org> wrote: > > Author: Fangrui Song > Date: 2021-03-20T21:37:49-07:00 > New Revision: c2f9086b6184a132ec8cac7edeb620813796e1e8 > > URL: > https://github.com/llvm/llvm-project/commit/c2f9086b6184a132ec8cac7edeb620813796e1e8 > DIFF: > https://github.com/llvm/llvm-project/commit/c2f9086b6184a132ec8cac7edeb620813796e1e8.diff > > LOG: [Driver] Gnu.cpp: drop an unneeded special rule related to sysroot > > Added: > > > Modified: > clang/lib/Driver/ToolChains/Gnu.cpp > > Removed: > > > > > ################################################################################ > diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp > b/clang/lib/Driver/ToolChains/Gnu.cpp > index 39be77463544..078579669634 100644 > --- a/clang/lib/Driver/ToolChains/Gnu.cpp > +++ b/clang/lib/Driver/ToolChains/Gnu.cpp > @@ -2853,8 +2853,6 @@ void Generic_GCC::AddMultiarchPaths(const Driver &D, > Paths); > } > > - // See comments above on the multilib variant for details of why this > is > - // included even from outside the sysroot. > const std::string &LibPath = > std::string(GCCInstallation.getParentLibPath()); > const llvm::Triple &GCCTriple = GCCInstallation.getTriple(); > @@ -2862,11 +2860,7 @@ void Generic_GCC::AddMultiarchPaths(const Driver &D, > addPathIfExists( > D, LibPath + "/../" + GCCTriple.str() + "/lib" + > Multilib.osSuffix(), > Paths); > - > - // See comments above on the multilib variant for details of why this > is > - // only included from within the sysroot. > - if (StringRef(LibPath).startswith(SysRoot)) > - addPathIfExists(D, LibPath, Paths); > + addPathIfExists(D, LibPath, Paths); > } > } > > > > > _______________________________________________ > cfe-commits mailing list > cfe-commits@lists.llvm.org > https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits >
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
