[zorg] r252577 - [sanitizer-bootstrap] Build stage2 compiler with -nostdinc++.

[Evgeniy Stepanov via llvm-commits]

Author: eugenis
Date: Mon Nov  9 19:24:33 2015
New Revision: 252577

URL: http://llvm.org/viewvc/llvm-project?rev=252577&view=rev
Log:
[sanitizer-bootstrap] Build stage2 compiler with -nostdinc++.

Stage2 uses libc++ in a non-standard location. With both
-stdlib=libc++ and -isystem pointing to the libc++ build directory,
we get both new and system libc++ headers in path, which confuses
include_next logic in libc++.


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

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh?rev=252577&r1=252576&r2=252577&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh Mon Nov  9 19:24:33 2015
@@ -173,7 +173,7 @@ function build_stage2 {
   local sanitizer_ldflags="-lc++abi -Wl,--rpath=${ROOT}/${libcxx_build_dir}/lib -L${ROOT}/${libcxx_build_dir}/lib"
   # See http://llvm.org/bugs/show_bug.cgi?id=19071, http://www.cmake.org/Bug/view.php?id=15264
   local cmake_bug_workaround_cflags="$sanitizer_ldflags $fsanitize_flag -w"
-  local sanitizer_cflags="-I${ROOT}/${libcxx_build_dir}/include -I${ROOT}/${libcxx_build_dir}/include/c++/v1 $cmake_bug_workaround_cflags"
+  local sanitizer_cflags="-nostdinc++ -isystem ${ROOT}/${libcxx_build_dir}/include -isystem ${ROOT}/${libcxx_build_dir}/include/c++/v1 $cmake_bug_workaround_cflags"
   mkdir -p ${build_dir}
   # Currently we do not want to fetch nor build libunwind, libcxx, libcxxabi, and lld on powerpc64 buildbots
   local extra_dir