This is an archive of the discontinued LLVM Phabricator instance.

Differential D132130

[compiler-rt] Fix check for cross-compiling
ClosedPublic

Authored by ellis on Aug 18 2022, 6:01 AM.

Details

Reviewers
smeenai
phosek
Commits
rGee80903a2ceb: [compiler-rt] Fix check for cross-compiling
Summary

When checking if we are cross-compiling, use CMAKE_HOST_SYSTEM_NAME
rather than CMAKE_HOST_SYSTEM which seems to have the full version
number attached.

Diff Detail

Revision Contents

PathSize
compiler-rt/
6 lines

Diff 453767

compiler-rt/CMakeLists.txt

Show First 20 Lines • Show All 121 Lines • ▼ Show 20 Lines
endif() endif()
pythonize_bool(ANDROID) pythonize_bool(ANDROID)
set(COMPILER_RT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(COMPILER_RT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(COMPILER_RT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) set(COMPILER_RT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
pythonize_bool(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR) pythonize_bool(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR)
# We support running instrumented tests when we're not cross compiling # We support running instrumented tests when we're not cross-compiling
# and target a UNIX-like system or Windows. # and target a UNIX-like system or Windows.
# We can run tests on Android even when we are cross-compiling. # We can run tests on Android even when we are cross-compiling.
if(("${CMAKE_HOST_SYSTEM}" STREQUAL "${CMAKE_SYSTEM}" AND (UNIX OR WIN32)) OR ANDROID if(("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "${CMAKE_SYSTEM_NAME}" AND (UNIX OR WIN32))
OR COMPILER_RT_EMULATOR) OR ANDROID OR COMPILER_RT_EMULATOR)
option(COMPILER_RT_CAN_EXECUTE_TESTS "Can we execute instrumented tests" ON) option(COMPILER_RT_CAN_EXECUTE_TESTS "Can we execute instrumented tests" ON)
else() else()
option(COMPILER_RT_CAN_EXECUTE_TESTS "Can we execute instrumented tests" OFF) option(COMPILER_RT_CAN_EXECUTE_TESTS "Can we execute instrumented tests" OFF)
endif() endif()
option(COMPILER_RT_DEBUG "Build runtimes with full debug info" OFF) option(COMPILER_RT_DEBUG "Build runtimes with full debug info" OFF)
option(COMPILER_RT_EXTERNALIZE_DEBUGINFO option(COMPILER_RT_EXTERNALIZE_DEBUGINFO
"Generate dSYM files and strip executables and libraries (Darwin Only)" OFF) "Generate dSYM files and strip executables and libraries (Darwin Only)" OFF)
▲ Show 20 Lines • Show All 602 Lines • Show Last 20 Lines