summaryrefslogtreecommitdiff
path: root/lib/xray/CMakeLists.txt
diff options
context:
space:
mode:
authorNitesh Jain <nitesh.jain@imgtec.com>2017-10-22 09:37:50 +0000
committerNitesh Jain <nitesh.jain@imgtec.com>2017-10-22 09:37:50 +0000
commit59dbe326d4bcc31f36ba363e08cad5c022f5fcc3 (patch)
tree315a1c79b0b9e2ed3bddaba212a9a2010541dcf2 /lib/xray/CMakeLists.txt
parent2b3e0d328bdd251a00c840dbbae0d13e35cd50e4 (diff)
[Compiler-rt][MIPS] Fix cross build for XRAY.
Reviewers: dberris, sdardis Subscribers: jaydeep, bhushan, llvm-commits Differential Revision: https://reviews.llvm.org/D38021 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@316286 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/xray/CMakeLists.txt')
-rw-r--r--lib/xray/CMakeLists.txt10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/xray/CMakeLists.txt b/lib/xray/CMakeLists.txt
index 6d24ba8bf..42f5ee69a 100644
--- a/lib/xray/CMakeLists.txt
+++ b/lib/xray/CMakeLists.txt
@@ -60,6 +60,12 @@ include_directories(../../include)
set(XRAY_CFLAGS ${SANITIZER_COMMON_CFLAGS})
set(XRAY_COMMON_DEFINITIONS XRAY_HAS_EXCEPTIONS=1)
+
+if (NOT MSVC AND NOT DEFINED TARGET_FLAGS)
+ set(TARGET_FLAGS ${CMAKE_CXX_FLAGS})
+ separate_arguments(TARGET_FLAGS)
+endif()
+
append_list_if(
COMPILER_RT_HAS_XRAY_COMPILER_FLAG XRAY_SUPPORTED=1 XRAY_COMMON_DEFINITIONS)
append_list_if(
@@ -67,7 +73,7 @@ append_list_if(
add_compiler_rt_object_libraries(RTXray
ARCHS ${XRAY_SUPPORTED_ARCH}
- SOURCES ${XRAY_SOURCES} CFLAGS ${XRAY_CFLAGS}
+ SOURCES ${XRAY_SOURCES} CFLAGS ${XRAY_CFLAGS} ${TARGET_FLAGS}
DEFS ${XRAY_COMMON_DEFINITIONS})
add_compiler_rt_component(xray)
@@ -82,7 +88,7 @@ foreach(arch ${XRAY_SUPPORTED_ARCH})
STATIC
ARCHS ${arch}
SOURCES ${${arch}_SOURCES}
- CFLAGS ${XRAY_CFLAGS}
+ CFLAGS ${XRAY_CFLAGS} ${TARGET_FLAGS}
DEFS ${XRAY_COMMON_DEFINITIONS}
OBJECT_LIBS ${XRAY_COMMON_RUNTIME_OBJECT_LIBS}
PARENT_TARGET xray)