<div dir="ltr">Same error on the Android Chrome bots, although I didn't check if this commit was the issue.<br><a href="https://ci.chromium.org/ui/p/chromium/builders/ci/ToTAndroid/16087/overview">https://ci.chromium.org/ui/p/chromium/builders/ci/ToTAndroid/16087/overview</a><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Mar 22, 2021 at 9:11 AM Matt Morehouse via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr">Hi Fangrui,<div><br></div><div>This change seems to have broken the link on Android: <a href="https://lab.llvm.org/buildbot/#/builders/77/builds/4777" target="_blank">https://lab.llvm.org/buildbot/#/builders/77/builds/4777</a></div><div>Could you please take a look?</div><div><br></div><div><pre style="box-sizing:border-box;overflow:auto;font-family:Menlo,Monaco,Consolas,"Courier New",monospace;font-size:13px;padding:9.5px;margin-top:0px;margin-bottom:0px;line-height:1.42857;color:rgb(199,199,199);word-break:break-all;background-color:rgb(0,0,0);border:1px solid rgb(204,204,204);border-radius:4px"><div style="box-sizing:border-box;height:18px"><span style="box-sizing:border-box"><span style="box-sizing:border-box">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</span></span></div></pre><br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Sat, Mar 20, 2021 at 9:38 PM Fangrui Song via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><br>
Author: Fangrui Song<br>
Date: 2021-03-20T21:37:49-07:00<br>
New Revision: c2f9086b6184a132ec8cac7edeb620813796e1e8<br>
<br>
URL: <a href="https://github.com/llvm/llvm-project/commit/c2f9086b6184a132ec8cac7edeb620813796e1e8" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/c2f9086b6184a132ec8cac7edeb620813796e1e8</a><br>
DIFF: <a href="https://github.com/llvm/llvm-project/commit/c2f9086b6184a132ec8cac7edeb620813796e1e8.diff" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/c2f9086b6184a132ec8cac7edeb620813796e1e8.diff</a><br>
<br>
LOG: [Driver] Gnu.cpp: drop an unneeded special rule related to sysroot<br>
<br>
Added: <br>
<br>
<br>
Modified: <br>
    clang/lib/Driver/ToolChains/Gnu.cpp<br>
<br>
Removed: <br>
<br>
<br>
<br>
################################################################################<br>
diff  --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp<br>
index 39be77463544..078579669634 100644<br>
--- a/clang/lib/Driver/ToolChains/Gnu.cpp<br>
+++ b/clang/lib/Driver/ToolChains/Gnu.cpp<br>
@@ -2853,8 +2853,6 @@ void Generic_GCC::AddMultiarchPaths(const Driver &D,<br>
                       Paths);<br>
     }<br>
<br>
-    // See comments above on the multilib variant for details of why this is<br>
-    // included even from outside the sysroot.<br>
     const std::string &LibPath =<br>
         std::string(GCCInstallation.getParentLibPath());<br>
     const llvm::Triple &GCCTriple = GCCInstallation.getTriple();<br>
@@ -2862,11 +2860,7 @@ void Generic_GCC::AddMultiarchPaths(const Driver &D,<br>
     addPathIfExists(<br>
         D, LibPath + "/../" + GCCTriple.str() + "/lib" + Multilib.osSuffix(),<br>
                     Paths);<br>
-<br>
-    // See comments above on the multilib variant for details of why this is<br>
-    // only included from within the sysroot.<br>
-    if (StringRef(LibPath).startswith(SysRoot))<br>
-      addPathIfExists(D, LibPath, Paths);<br>
+    addPathIfExists(D, LibPath, Paths);<br>
   }<br>
 }<br>
<br>
<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div>