Skip to content

Commit 5927492

Browse files
authored
Revert "CompilerRT: Normalize COMPILER_RT_DEFAULT_TARGET_TRIPLE" (#88663)
Reverts #88407
1 parent 0016216 commit 5927492

File tree

1 file changed

+3
-15
lines changed

1 file changed

+3
-15
lines changed

compiler-rt/cmake/Modules/CompilerRTUtils.cmake

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -362,22 +362,10 @@ macro(construct_compiler_rt_default_triple)
362362
message(FATAL_ERROR "CMAKE_C_COMPILER_TARGET must also be set when COMPILER_RT_DEFAULT_TARGET_ONLY is ON")
363363
endif()
364364
message(STATUS "cmake c compiler target: ${CMAKE_C_COMPILER_TARGET}")
365-
if ("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
366-
execute_process(COMMAND ${CMAKE_C_COMPILER} --target=${CMAKE_C_COMPILER_TARGET} -print-effective-triple
367-
OUTPUT_VARIABLE COMPILER_RT_DEFAULT_TARGET_TRIPLE
368-
OUTPUT_STRIP_TRAILING_WHITESPACE)
369-
else()
370-
set(COMPILER_RT_DEFAULT_TARGET_TRIPLE ${CMAKE_C_COMPILER_TARGET})
371-
endif()
365+
set(COMPILER_RT_DEFAULT_TARGET_TRIPLE ${CMAKE_C_COMPILER_TARGET})
372366
else()
373-
if ("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
374-
execute_process(COMMAND ${CMAKE_C_COMPILER} --target=${LLVM_TARGET_TRIPLE} -print-effective-triple
375-
OUTPUT_VARIABLE COMPILER_RT_DEFAULT_TARGET_TRIPLE
376-
OUTPUT_STRIP_TRAILING_WHITESPACE)
377-
else()
378-
set(COMPILER_RT_DEFAULT_TARGET_TRIPLE ${LLVM_TARGET_TRIPLE} CACHE STRING
379-
"Default triple for which compiler-rt runtimes will be built.")
380-
endif()
367+
set(COMPILER_RT_DEFAULT_TARGET_TRIPLE ${LLVM_TARGET_TRIPLE} CACHE STRING
368+
"Default triple for which compiler-rt runtimes will be built.")
381369
endif()
382370

383371
string(REPLACE "-" ";" LLVM_TARGET_TRIPLE_LIST ${COMPILER_RT_DEFAULT_TARGET_TRIPLE})

0 commit comments

Comments
 (0)