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

[Ellis Hoag via llvm-commits]

Author: Ellis Hoag
Date: 2022-08-18T13:43:21-07:00
New Revision: 18f6b05e0a5a4197bac787f5522669576c134869

URL: https://github.com/llvm/llvm-project/commit/18f6b05e0a5a4197bac787f5522669576c134869
DIFF: https://github.com/llvm/llvm-project/commit/18f6b05e0a5a4197bac787f5522669576c134869.diff

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

This reverts commit ee80903a2ceb03f4617550eba55881f7b80ebb8e.

This seems to have broke builds

Differential Revision: https://reviews.llvm.org/D132174

Added: 
    

Modified: 
    compiler-rt/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
index e60c28a8f3ad..e568866db33b 100644
--- a/compiler-rt/CMakeLists.txt
+++ b/compiler-rt/CMakeLists.txt
@@ -127,11 +127,11 @@ set(COMPILER_RT_BINARY_DIR ${CMAKE_CURRENT_BINARY_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.
 # 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))
-   OR ANDROID OR COMPILER_RT_EMULATOR)
+if(("${CMAKE_HOST_SYSTEM}" STREQUAL "${CMAKE_SYSTEM}" AND (UNIX OR WIN32)) OR ANDROID
+   OR COMPILER_RT_EMULATOR)
   option(COMPILER_RT_CAN_EXECUTE_TESTS "Can we execute instrumented tests" ON)
 else()
   option(COMPILER_RT_CAN_EXECUTE_TESTS "Can we execute instrumented tests" OFF)