[zorg] r222657 - Trying fixing MSan bootstrap by setting both LDFLAGS and CMAKE_EXE_LINKER_FLAGS.

[Evgeniy Stepanov]

Author: eugenis
Date: Mon Nov 24 09:42:49 2014
New Revision: 222657

URL: http://llvm.org/viewvc/llvm-project?rev=222657&view=rev
Log:
Trying fixing MSan bootstrap by setting both LDFLAGS and CMAKE_EXE_LINKER_FLAGS.


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=222657&r1=222656&r2=222657&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh Mon Nov 24 09:42:49 2014
@@ -52,7 +52,7 @@ if [ ! -d llvm_build0 ]; then
 fi
 # Build cxx/cxxabi to fool the compiler check in MSan stage 2.
 (cd llvm_build0 && cmake ${CMAKE_STAGE1_OPTIONS} $LLVM && \
-  ninja clang compiler-rt llvm-symbolizer cxx cxxabi) || \
+  ninja clang compiler-rt llvm-symbolizer) || \
   echo @@@STEP_FAILURE@@@
 
 CLANG_PATH=$ROOT/llvm_build0/bin
@@ -93,7 +93,7 @@ MSAN_LDFLAGS="-stdlib=libc++ -lc++abi -W
 # 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="-lc++abi" \
+ LDFLAGS="${MSAN_LDFLAGS}" \
  cmake ${CMAKE_STAGE2_COMMON_OPTIONS} \
    -DLLVM_USE_SANITIZER=${MEMORY_SANITIZER_KIND} \
    -DCMAKE_C_FLAGS="${MSAN_CFLAGS}" \