From a9c59b28738e554c10139524143586f64e6f72ea Mon Sep 17 00:00:00 2001
From: Puyan Lotfi <puyan@puyan.org>
Date: Mon, 29 Jul 2019 19:21:58 +0000
Subject: [PATCH] [compiler-rt] Appending COMPILER_RT_LIBCXX_PATH -isystem
 include for xray (2)

Second attempt.

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

llvm-svn: 367250
---
 compiler-rt/lib/xray/CMakeLists.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/compiler-rt/lib/xray/CMakeLists.txt b/compiler-rt/lib/xray/CMakeLists.txt
index 0a86c52..d436a32 100644
--- a/compiler-rt/lib/xray/CMakeLists.txt
+++ b/compiler-rt/lib/xray/CMakeLists.txt
@@ -118,6 +118,11 @@ endforeach()
 include_directories(..)
 include_directories(../../include)
 
+if(COMPILER_RT_USE_LIBCXX)
+  if (SANITIZER_CXX_ABI_LIBNAME STREQUAL "libc++")
+    set(SANITIZER_COMMON_CFLAGS "${SANITIZER_COMMON_CFLAGS} -isystem ${COMPILER_RT_LIBCXX_PATH}/include")
+  endif()
+endif()
 set(XRAY_CFLAGS ${SANITIZER_COMMON_CFLAGS})
 set(XRAY_COMMON_DEFINITIONS XRAY_HAS_EXCEPTIONS=1)
 
-- 
2.7.4