[compiler-rt] r367962 - [compiler-rt] Appending COMPILER_RT_LIBCXX_PATH -isystem include for xray (3)

[Puyan Lotfi via llvm-commits]

Author: zer0
Date: Mon Aug  5 17:34:34 2019
New Revision: 367962

URL: http://llvm.org/viewvc/llvm-project?rev=367962&view=rev
Log:
[compiler-rt] Appending COMPILER_RT_LIBCXX_PATH -isystem include for xray (3)

Third landing attempt: Added "if (HAVE_LIBCXX)" to keep Green Dragon green.

Haven't found a better way to pass the libcxx include path for building
compiler-rt with libcxx; this seems to be missing only for xray.

Differential Revision: https://reviews.llvm.org/D65307


Modified:
    compiler-rt/trunk/lib/xray/CMakeLists.txt

Modified: compiler-rt/trunk/lib/xray/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/xray/CMakeLists.txt?rev=367962&r1=367961&r2=367962&view=diff
==============================================================================
--- compiler-rt/trunk/lib/xray/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/xray/CMakeLists.txt Mon Aug  5 17:34:34 2019
@@ -132,6 +132,13 @@ endforeach()
 include_directories(..)
 include_directories(../../include)
 
+if(COMPILER_RT_USE_LIBCXX)
+  if (SANITIZER_CXX_ABI_LIBNAME STREQUAL "libc++")
+    if (HAVE_LIBCXX)
+      set(SANITIZER_COMMON_CFLAGS "${SANITIZER_COMMON_CFLAGS} -isystem ${COMPILER_RT_LIBCXX_PATH}/include")
+    endif()
+  endif()
+endif()
 set(XRAY_CFLAGS ${SANITIZER_COMMON_CFLAGS})
 set(XRAY_COMMON_DEFINITIONS XRAY_HAS_EXCEPTIONS=1)