This is an archive of the discontinued LLVM Phabricator instance.

Differential D53752

[CMake] Convert paths to the right form in standalone builds on Windows
AbandonedPublic

Authored by SquallATF on Oct 26 2018, 2:33 AM.

Details

Reviewers
None

Diff Detail

Event Timeline

SquallATF created this revision.Oct 26 2018, 2:33 AM
Herald added subscribers: Restricted Project, llvm-commits, delcypher, mgorny. · View Herald TranscriptOct 26 2018, 2:33 AM
Harbormaster completed remote builds in B24243: Diff 171274.Oct 26 2018, 2:33 AM
SquallATF abandoned this revision.Oct 26 2018, 2:34 AM

Revision Contents

PathSize
cmake/
Modules/
1 line

Diff 171274

cmake/Modules/HandleCompilerRT.cmake

function(find_compiler_rt_library name variable) function(find_compiler_rt_library name variable)
set(CLANG_COMMAND ${CMAKE_CXX_COMPILER} ${SANITIZER_COMMON_CFLAGS} set(CLANG_COMMAND ${CMAKE_CXX_COMPILER} ${SANITIZER_COMMON_CFLAGS}
"--rtlib=compiler-rt" "--print-libgcc-file-name") "--rtlib=compiler-rt" "--print-libgcc-file-name")
if (CMAKE_CXX_COMPILER_ID MATCHES Clang AND CMAKE_CXX_COMPILER_TARGET) if (CMAKE_CXX_COMPILER_ID MATCHES Clang AND CMAKE_CXX_COMPILER_TARGET)
list(APPEND CLANG_COMMAND "--target=${CMAKE_CXX_COMPILER_TARGET}") list(APPEND CLANG_COMMAND "--target=${CMAKE_CXX_COMPILER_TARGET}")
endif() endif()
execute_process( execute_process(
COMMAND ${CLANG_COMMAND} COMMAND ${CLANG_COMMAND}
RESULT_VARIABLE HAD_ERROR RESULT_VARIABLE HAD_ERROR
OUTPUT_VARIABLE LIBRARY_FILE OUTPUT_VARIABLE LIBRARY_FILE
) )
string(STRIP "${LIBRARY_FILE}" LIBRARY_FILE) string(STRIP "${LIBRARY_FILE}" LIBRARY_FILE)
file(TO_CMAKE_PATH "${LIBRARY_FILE}" LIBRARY_FILE)
string(REPLACE "builtins" "${name}" LIBRARY_FILE "${LIBRARY_FILE}") string(REPLACE "builtins" "${name}" LIBRARY_FILE "${LIBRARY_FILE}")
if (NOT HAD_ERROR AND EXISTS "${LIBRARY_FILE}") if (NOT HAD_ERROR AND EXISTS "${LIBRARY_FILE}")
message(STATUS "Found compiler-rt ${name} library: ${LIBRARY_FILE}") message(STATUS "Found compiler-rt ${name} library: ${LIBRARY_FILE}")
set(${variable} "${LIBRARY_FILE}" PARENT_SCOPE) set(${variable} "${LIBRARY_FILE}" PARENT_SCOPE)
else() else()
message(STATUS "Failed to find compiler-rt ${name} library") message(STATUS "Failed to find compiler-rt ${name} library")
endif() endif()
endfunction() endfunction()