[zorg] r337836 - Revert "Revert r337773, r337779."

[Matt Morehouse via llvm-commits]

Author: morehouse
Date: Tue Jul 24 09:18:13 2018
New Revision: 337836

URL: http://llvm.org/viewvc/llvm-project?rev=337836&view=rev
Log:
Revert "Revert r337773, r337779."

Changes to libcxx include directory have relanded in r337833.

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=337836&r1=337835&r2=337836&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh Tue Jul 24 09:18:13 2018
@@ -204,7 +204,7 @@ function build_stage2 {
         $LLVM && \
       ninja cxx cxxabi) || echo $step_result
     sanitizer_ldflags="$sanitizer_ldflags -lc++abi -Wl,--rpath=${ROOT}/${libcxx_build_dir}/lib -L${ROOT}/${libcxx_build_dir}/lib"
-    sanitizer_cflags="$sanitizer_cflags -nostdinc++ -isystem ${ROOT}/${libcxx_build_dir}/include -isystem ${ROOT}/${libcxx_build_dir}/include/c++/v1"
+    sanitizer_cflags="$sanitizer_cflags -nostdinc++ -isystem ${ROOT}/${libcxx_build_dir}/projects/libcxx/include -isystem ${ROOT}/${libcxx_build_dir}/projects/libcxx/include/c++/v1"
     cmake_libcxx_flag="-DLLVM_ENABLE_LIBCXX=ON"
   fi