This is an archive of the discontinued LLVM Phabricator instance.

Differential D132174

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

Authored by ellis on Aug 18 2022, 1:42 PM.

Details

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

This reverts commit ee80903a2ceb03f4617550eba55881f7b80ebb8e.

This seems to have broke builds

Diff Detail

Event Timeline

ellis created this revision.Aug 18 2022, 1:42 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 18 2022, 1:42 PM
Herald added subscribers: Enna1, mgorny, dberris. · View Herald Transcript
ellis requested review of this revision.Aug 18 2022, 1:42 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 18 2022, 1:42 PM
Herald added a subscriber: Restricted Project. · View Herald Transcript
This revision was not accepted when it landed; it landed in state Needs Review.Aug 18 2022, 1:43 PM
This revision was landed with ongoing or failed builds.
Closed by commit rG18f6b05e0a5a: 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: rG18f6b05e0a5a: Revert "[compiler-rt] Fix check for cross-compiling".
Harbormaster completed remote builds in B182080: Diff 453770.Aug 18 2022, 2:03 PM
ellis added a reverting change: D132230: Revert "Revert "[compiler-rt] Fix check for cross-compiling"".Aug 19 2022, 7:00 AM
ellis added a reverting change: rG5779966da82b: Revert "Revert "[compiler-rt] Fix check for cross-compiling"".Aug 19 2022, 7:00 AM

Revision Contents

PathSize
compiler-rt/
6 lines

Diff 453770

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_NAME}" STREQUAL "${CMAKE_SYSTEM_NAME}" AND (UNIX OR WIN32)) if(("${CMAKE_HOST_SYSTEM}" STREQUAL "${CMAKE_SYSTEM}" AND (UNIX OR WIN32)) OR ANDROID
OR ANDROID OR COMPILER_RT_EMULATOR) 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