summaryrefslogtreecommitdiff
path: root/lib/xray
diff options
context:
space:
mode:
authorPuyan Lotfi <puyan@puyan.org>2019-08-06 00:34:34 +0000
committerPuyan Lotfi <puyan@puyan.org>2019-08-06 00:34:34 +0000
commitb2845e4cd7e90a2d9b61800c3f16a8091e8996be (patch)
tree0f65d116e88b0b1db10c3ebdf22d0acb9aa79c18 /lib/xray
parent6a27c31dffe580a9d2e2a535aad95a1e31286cf8 (diff)
downloadcompiler-rt-b2845e4cd7e90a2d9b61800c3f16a8091e8996be.tar.gz
[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 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@367962 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/xray')
-rw-r--r--lib/xray/CMakeLists.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/xray/CMakeLists.txt b/lib/xray/CMakeLists.txt
index 3798f557c..17dc356a2 100644
--- a/lib/xray/CMakeLists.txt
+++ b/lib/xray/CMakeLists.txt
@@ -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)