[zorg] r222744 - Yet another attempt to fix MSan bootstrap bot.

[Evgeniy Stepanov]

Author: eugenis
Date: Tue Nov 25 03:43:35 2014
New Revision: 222744

URL: http://llvm.org/viewvc/llvm-project?rev=222744&view=rev
Log:
Yet another attempt to fix MSan bootstrap bot.

Now we just add _everything_ to CFLAGS and tell clang to shut up with -w.

This is a workaround for
  http://llvm.org/bugs/show_bug.cgi?id=19071
  http://www.cmake.org/Bug/view.php?id=15264

Modified:
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh?rev=222744&r1=222743&r2=222744&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh Tue Nov 25 03:43:35 2014
@@ -85,19 +85,17 @@ if [ ! -d llvm_build_msan ]; then
   mkdir llvm_build_msan
 fi
 
-MSAN_CFLAGS="-I${ROOT}/libcxx_build_msan/include"
-MSAN_CXXFLAGS="$MSAN_CFLAGS -stdlib=libc++"
-MSAN_LDFLAGS="-stdlib=libc++ -lc++abi -Wl,--rpath=${ROOT}/libcxx_build_msan/lib -L${ROOT}/libcxx_build_msan/lib"
+MSAN_LDFLAGS="-lc++abi -Wl,--rpath=${ROOT}/libcxx_build_msan/lib -L${ROOT}/libcxx_build_msan/lib"
+# See http://llvm.org/bugs/show_bug.cgi?id=19071, http://www.cmake.org/Bug/view.php?id=15264
+CMAKE_BUG_WORKAROUND_CFLAGS="$MSAN_LDFLAGS -fsanitize=memory -w"
+MSAN_CFLAGS="-I${ROOT}/libcxx_build_msan/include -I${ROOT}/libcxx_build_msan/include/c++/v1 $CMAKE_BUG_WORKAROUND_CFLAGS"
 
-# The LDFLAGS setting below does not affect the build itself, but it is used in the CMake compiler check.
-# CMAKE_EXE_LINKER_FLAGS, on the other hand, affects the rest of the build, but not the compiler check.
-# This is crazy.
 (cd llvm_build_msan && \
- LDFLAGS="${MSAN_LDFLAGS} -fsanitize=memory" \
  cmake ${CMAKE_STAGE2_COMMON_OPTIONS} \
    -DLLVM_USE_SANITIZER=${MEMORY_SANITIZER_KIND} \
+   -DLLVM_ENABLE_LIBCXX=ON \
    -DCMAKE_C_FLAGS="${MSAN_CFLAGS}" \
-   -DCMAKE_CXX_FLAGS="${MSAN_CXXFLAGS}" \
+   -DCMAKE_CXX_FLAGS="${MSAN_CFLAGS}" \
    -DCMAKE_EXE_LINKER_FLAGS="${MSAN_LDFLAGS}" \
    $LLVM && \
  ninja clang) || echo @@@STEP_FAILURE@@@