From 7800310cb50408ba42f5321f7de956fb69a9efda Mon Sep 17 00:00:00 2001 From: Petr Hosek Date: Mon, 27 Jan 2020 19:20:02 -0800 Subject: [PATCH] [CMake][compiler-rt] Replace Windows backslashes with CMake ones XRay builds uses llvm-config to obtain the ldflags and libs and then passes those to CMake. Unfortunately, this breaks on Windows because CMake tries to interpret backslashes followed by certain characters as flags. We need to rewrite these into forward slashes that are used by CMake (even on Windows). Differential Revision: https://reviews.llvm.org/D73523 --- compiler-rt/cmake/Modules/CompilerRTUtils.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake index 6e672b1..84f2467 100644 --- a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake +++ b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake @@ -248,6 +248,8 @@ macro(load_llvm_config) string(REGEX REPLACE "[ \t]*[\r\n]+[ \t]*" ";" CONFIG_OUTPUT ${CONFIG_OUTPUT}) list(GET CONFIG_OUTPUT 0 LDFLAGS) list(GET CONFIG_OUTPUT 1 LIBLIST) + file(TO_CMAKE_PATH "${LDFLAGS}" LDFLAGS) + file(TO_CMAKE_PATH "${LIBLIST}" LIBLIST) set(LLVM_XRAY_LDFLAGS ${LDFLAGS} CACHE STRING "Linker flags for LLVMXRay library") set(LLVM_XRAY_LIBLIST ${LIBLIST} CACHE STRING "Library list for LLVMXRay") set(COMPILER_RT_HAS_LLVMXRAY TRUE) @@ -268,6 +270,8 @@ macro(load_llvm_config) if (LIBLIST STREQUAL "") message(WARNING "testingsupport library not installed, some tests will be skipped") else() + file(TO_CMAKE_PATH "${LDFLAGS}" LDFLAGS) + file(TO_CMAKE_PATH "${LIBLIST}" LIBLIST) set(LLVM_TESTINGSUPPORT_LDFLAGS ${LDFLAGS} CACHE STRING "Linker flags for LLVMTestingSupport library") set(LLVM_TESTINGSUPPORT_LIBLIST ${LIBLIST} CACHE STRING "Library list for LLVMTestingSupport") set(COMPILER_RT_HAS_LLVMTESTINGSUPPORT TRUE) -- 2.7.4