Index: lib/xray/CMakeLists.txt =================================================================== --- lib/xray/CMakeLists.txt +++ lib/xray/CMakeLists.txt @@ -59,6 +59,15 @@ include_directories(../../include) set(XRAY_CFLAGS ${SANITIZER_COMMON_CFLAGS}) + +# To cross build XRAY we need to append CMAKE_C_FLAGS +if(NOT MSVC AND DEFINED CMAKE_C_FLAGS) + set(XRAY_CROSS_COMPILE_FLAGS ${CMAKE_C_FLAGS}) + separate_arguments(XRAY_CROSS_COMPILE_FLAGS) + LIST(APPEND XRAY_CFLAGS ${XRAY_CROSS_COMPILE_FLAGS}) +endif() + + set(XRAY_COMMON_DEFINITIONS XRAY_HAS_EXCEPTIONS=1) append_list_if( COMPILER_RT_HAS_XRAY_COMPILER_FLAG XRAY_SUPPORTED=1 XRAY_COMMON_DEFINITIONS)