[zorg] r344380 - [Zorg] Fix Android sanitizer flags.

[Dan Albert via llvm-commits]

r344419 and r344420. Sorry about the breakage (and thanks for catching that
it was still broken, I hadn't seen that).

On Fri, Oct 12, 2018 at 2:37 PM Dan Albert <danalbert at google.com> wrote:

> I'll roll back both for now. Not really sure why the second one didn't fix
> it.
>
> On Fri, Oct 12, 2018 at 2:34 PM Kostya Serebryany <kcc at google.com> wrote:
>
>> didn't seem to help :(
>> the bots are still red
>> <http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-android/builds/15964/steps/build%20android%2Faarch64/logs/stdio>
>>
>>
>> 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.aarch64.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.Sclang-8: error: argument unused during compilation: '-stdlib=libstdc++' [-Werror,-Wunused-command-line-argument]
>> ninja: build stopped: subcommand failed.
>>
>>
>> On Fri, Oct 12, 2018 at 10:42 AM Dan Albert via llvm-commits <
>> llvm-commits at lists.llvm.org> wrote:
>>
>>> Author: danalbert
>>> Date: Fri Oct 12 10:40:38 2018
>>> New Revision: 344380
>>>
>>> URL: http://llvm.org/viewvc/llvm-project?rev=344380&view=rev
>>> Log:
>>> [Zorg] Fix Android sanitizer flags.
>>>
>>> There's C code in this project, so `-stdlib` needs to be used in only
>>> the CXX_FLAGS to avoid unused argument errors.
>>>
>>> Modified:
>>>
>>> zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
>>>
>>> Modified:
>>> zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh?rev=344380&r1=344379&r2=344380&view=diff
>>>
>>> ==============================================================================
>>> ---
>>> zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
>>> (original)
>>> +++
>>> zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
>>> Fri Oct 12 10:40:38 2018
>>> @@ -43,7 +43,8 @@ function configure_android { # ARCH trip
>>>    local ANDROID_TOOLCHAIN=$ROOT/android_ndk/standalone-$_arch
>>>    local ANDROID_LIBRARY_OUTPUT_DIR=$(ls -d
>>> $ROOT/llvm_build64/lib/clang/* | tail -1)
>>>    local ANDROID_EXEC_OUTPUT_DIR=$ROOT/llvm_build64/bin
>>> -  local ANDROID_FLAGS="--target=$_triple -stdlib=libstdc++
>>> --sysroot=$ANDROID_TOOLCHAIN/sysroot -B$ANDROID_TOOLCHAIN"
>>> +  local ANDROID_FLAGS="--target=$_triple
>>> --sysroot=$ANDROID_TOOLCHAIN/sysroot -B$ANDROID_TOOLCHAIN"
>>> +  local ANDROID_CXX_FLAGS="$ANDROID_FLAGS -stdlib=libstdc++"
>>>
>>>    # Always clobber android build tree.
>>>    # It has a hidden dependency on clang (through CXX) which is not
>>> known to
>>> @@ -58,7 +59,7 @@ function configure_android { # ARCH trip
>>>      -DCMAKE_C_COMPILER=$ROOT/llvm_build64/bin/clang \
>>>      -DCMAKE_CXX_COMPILER=$ROOT/llvm_build64/bin/clang++ \
>>>      -DCMAKE_C_FLAGS="$ANDROID_FLAGS" \
>>> -    -DCMAKE_CXX_FLAGS="$ANDROID_FLAGS" \
>>> +    -DCMAKE_CXX_FLAGS="$ANDROID_CXX_FLAGS" \
>>>      -DCMAKE_EXE_LINKER_FLAGS="-pie" \
>>>      -DCMAKE_SKIP_RPATH=ON \
>>>      -DLLVM_BUILD_RUNTIME=OFF \
>>> @@ -74,7 +75,7 @@ function configure_android { # ARCH trip
>>>      -DCOMPILER_RT_INCLUDE_TESTS=ON \
>>>      -DCOMPILER_RT_ENABLE_WERROR=ON \
>>>      -DCMAKE_C_FLAGS="$ANDROID_FLAGS" \
>>> -    -DCMAKE_CXX_FLAGS="$ANDROID_FLAGS" \
>>> +    -DCMAKE_CXX_FLAGS="$ANDROID_CXX_FLAGS" \
>>>      -DANDROID=1 \
>>>      -DCOMPILER_RT_TEST_COMPILER_CFLAGS="$ANDROID_FLAGS" \
>>>      -DCOMPILER_RT_TEST_TARGET_TRIPLE=$_triple \
>>>
>>>
>>> _______________________________________________
>>> llvm-commits mailing list
>>> llvm-commits at lists.llvm.org
>>> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>>>
>>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20181012/954709d6/attachment.html>