<div dir="ltr"><div dir="ltr"><div dir="ltr">r344419 and r344420. Sorry about the breakage (and thanks for catching that it was still broken, I hadn't seen that).</div></div></div><br><div class="gmail_quote"><div dir="ltr">On Fri, Oct 12, 2018 at 2:37 PM Dan Albert <<a href="mailto:danalbert@google.com">danalbert@google.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">I'll roll back both for now. Not really sure why the second one didn't fix it.</div><br><div class="gmail_quote"><div dir="ltr">On Fri, Oct 12, 2018 at 2:34 PM Kostya Serebryany <<a href="mailto:kcc@google.com" target="_blank">kcc@google.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">didn't seem to help :( <div>the <a href="http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-android/builds/15964/steps/build%20android%2Faarch64/logs/stdio" target="_blank">bots are still red</a> </div><div><pre style="font-family:"Courier New",courier,monotype,monospace;color:rgb(0,0,0);font-size:medium"><span class="m_-6268392970747809m_-5438437259021623701gmail-stdout">FAILED: /var/lib/buildbot/sanitizer-buildbot6/sanitizer-x86_64-linux-android/build/llvm_build64/bin/clang -DHAVE_RPC_XDR_H=0 -DHAVE_TIRPC_RPC_XDR_H=0 -I/var/lib/buildbot/sanitizer-buildbot6/sanitizer-x86_64-linux-android/build/llvm/projects/compiler-rt/lib/sanitizer_common/.. -O3 -DNDEBUG --target=aarch64-linux-android --sysroot=/var/lib/buildbot/sanitizer-buildbot6/sanitizer-x86_64-linux-android/build/android_ndk/standalone-aarch64/sysroot -B/var/lib/buildbot/sanitizer-buildbot6/sanitizer-x86_64-linux-android/build/android_ndk/standalone-aarch64 -stdlib=libstdc++ -Wall -Werror -std=c++11 -Wno-unused-parameter -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fno-stack-protector -fno-sanitize=safe-stack -fvisibility=hidden -fno-lto -O3 -gline-tables-only -Wno-gnu -Wno-variadic-macros -Wno-c99-extensions -Wno-non-virtual-dtor -fno-rtti -Wframe-larger-than=570 -Wglobal-constructors -MD -MT lib/sanitizer_common/CMakeFiles/RTSanitizerCommonNoTermination.aarch64.dir/sanitizer_linux_x86_64.S.o -MF lib/sanitizer_common/CMakeFiles/RTSanitizerCommonNoTermination.aarch64.dir/sanitizer_linux_x86_64.S.o.d -o lib/sanitizer_common/CMakeFiles/RTSanitizerCommonNoTermination.aar</span><span class="m_-6268392970747809m_-5438437259021623701gmail-stdout">ch64.dir/sanitizer_linux_x86_64.S.o -c /var/lib/buildbot/sanitizer-buildbot6/sanitizer-x86_64-linux-android/build/llvm/projects/compiler-rt/lib/sanitizer_common/sanitizer_linux_x86_64.S
</span><span class="m_-6268392970747809m_-5438437259021623701gmail-stdout">clang-8: error: argument unused during compilation: '-stdlib=libstdc++' [-Werror,-Wunused-command-line-argument]
ninja: build stopped: subcommand failed.</span></pre></div></div><br><div class="gmail_quote"><div dir="ltr">On Fri, Oct 12, 2018 at 10:42 AM Dan Albert via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: danalbert<br>
Date: Fri Oct 12 10:40:38 2018<br>
New Revision: 344380<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=344380&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=344380&view=rev</a><br>
Log:<br>
[Zorg] Fix Android sanitizer flags.<br>
<br>
There's C code in this project, so `-stdlib` needs to be used in only<br>
the CXX_FLAGS to avoid unused argument errors.<br>
<br>
Modified:<br>
zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh<br>
<br>
Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh?rev=344380&r1=344379&r2=344380&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh?rev=344380&r1=344379&r2=344380&view=diff</a><br>
==============================================================================<br>
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh (original)<br>
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh Fri Oct 12 10:40:38 2018<br>
@@ -43,7 +43,8 @@ function configure_android { # ARCH trip<br>
local ANDROID_TOOLCHAIN=$ROOT/android_ndk/standalone-$_arch<br>
local ANDROID_LIBRARY_OUTPUT_DIR=$(ls -d $ROOT/llvm_build64/lib/clang/* | tail -1)<br>
local ANDROID_EXEC_OUTPUT_DIR=$ROOT/llvm_build64/bin<br>
- local ANDROID_FLAGS="--target=$_triple -stdlib=libstdc++ --sysroot=$ANDROID_TOOLCHAIN/sysroot -B$ANDROID_TOOLCHAIN"<br>
+ local ANDROID_FLAGS="--target=$_triple --sysroot=$ANDROID_TOOLCHAIN/sysroot -B$ANDROID_TOOLCHAIN"<br>
+ local ANDROID_CXX_FLAGS="$ANDROID_FLAGS -stdlib=libstdc++"<br>
<br>
# Always clobber android build tree.<br>
# It has a hidden dependency on clang (through CXX) which is not known to<br>
@@ -58,7 +59,7 @@ function configure_android { # ARCH trip<br>
-DCMAKE_C_COMPILER=$ROOT/llvm_build64/bin/clang \<br>
-DCMAKE_CXX_COMPILER=$ROOT/llvm_build64/bin/clang++ \<br>
-DCMAKE_C_FLAGS="$ANDROID_FLAGS" \<br>
- -DCMAKE_CXX_FLAGS="$ANDROID_FLAGS" \<br>
+ -DCMAKE_CXX_FLAGS="$ANDROID_CXX_FLAGS" \<br>
-DCMAKE_EXE_LINKER_FLAGS="-pie" \<br>
-DCMAKE_SKIP_RPATH=ON \<br>
-DLLVM_BUILD_RUNTIME=OFF \<br>
@@ -74,7 +75,7 @@ function configure_android { # ARCH trip<br>
-DCOMPILER_RT_INCLUDE_TESTS=ON \<br>
-DCOMPILER_RT_ENABLE_WERROR=ON \<br>
-DCMAKE_C_FLAGS="$ANDROID_FLAGS" \<br>
- -DCMAKE_CXX_FLAGS="$ANDROID_FLAGS" \<br>
+ -DCMAKE_CXX_FLAGS="$ANDROID_CXX_FLAGS" \<br>
-DANDROID=1 \<br>
-DCOMPILER_RT_TEST_COMPILER_CFLAGS="$ANDROID_FLAGS" \<br>
-DCOMPILER_RT_TEST_TARGET_TRIPLE=$_triple \<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>
</blockquote></div>
</blockquote></div>