This is an archive of the discontinued LLVM Phabricator instance.

Differential D132230

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

Authored by ellis on Aug 19 2022, 7:00 AM.

Details

Reviewers
None
Commits
rG5779966da82b: Revert "Revert "[compiler-rt] Fix check for cross-compiling""
Summary

This reverts commit 18f6b05e0a5a4197bac787f5522669576c134869.

This is a reland of https://reviews.llvm.org/D132130 which I incorrectly
thought had broken the builds.

Diff Detail

Event Timeline

ellis created this revision.Aug 19 2022, 7:00 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 19 2022, 7:00 AM
Herald added subscribers: Enna1, mgorny, dberris. · View Herald Transcript
ellis requested review of this revision.Aug 19 2022, 7:00 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 19 2022, 7:00 AM
Herald added a subscriber: Restricted Project. · View Herald Transcript
This revision was not accepted when it landed; it landed in state Needs Review.Aug 19 2022, 7:00 AM
This revision was landed with ongoing or failed builds.
Closed by commit rG5779966da82b: Revert "Revert "[compiler-rt] Fix check for cross-compiling"" (authored by ellis). · Explain Why
This revision was automatically updated to reflect the committed changes.
ellis added a commit: rG5779966da82b: Revert "Revert "[compiler-rt] Fix check for cross-compiling"".
Harbormaster completed remote builds in B182211: Diff 453982.Aug 19 2022, 7:19 AM

Revision Contents

PathSize
compiler-rt/
6 lines

Diff 453983

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 600 Lines • Show Last 20 Lines