[compiler-rt] Revert "CompilerRT: Normalize COMPILER_RT_DEFAULT_TARGET_TRIPLE" (PR #88663)
YunQiang Su via llvm-commits
llvm-commits at lists.llvm.org
Sun Apr 14 09:11:08 PDT 2024
https://github.com/wzssyqa created https://github.com/llvm/llvm-project/pull/88663
Reverts llvm/llvm-project#88407
>From f12c81f2be59da892f7c54fb58cd9b0571bb438c Mon Sep 17 00:00:00 2001
From: YunQiang Su <wzssyqa at gmail.com>
Date: Mon, 15 Apr 2024 00:10:22 +0800
Subject: [PATCH] Revert "CompilerRT: Normalize
COMPILER_RT_DEFAULT_TARGET_TRIPLE (#88407)"
This reverts commit 00162162dd853795c532afa5dec4dc4e798d4a4b.
---
.../cmake/Modules/CompilerRTUtils.cmake | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake
index 75f111efeb102f..e8e5f612d5b03c 100644
--- a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake
+++ b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake
@@ -362,22 +362,10 @@ macro(construct_compiler_rt_default_triple)
message(FATAL_ERROR "CMAKE_C_COMPILER_TARGET must also be set when COMPILER_RT_DEFAULT_TARGET_ONLY is ON")
endif()
message(STATUS "cmake c compiler target: ${CMAKE_C_COMPILER_TARGET}")
- if ("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
- execute_process(COMMAND ${CMAKE_C_COMPILER} --target=${CMAKE_C_COMPILER_TARGET} -print-effective-triple
- OUTPUT_VARIABLE COMPILER_RT_DEFAULT_TARGET_TRIPLE
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- else()
- set(COMPILER_RT_DEFAULT_TARGET_TRIPLE ${CMAKE_C_COMPILER_TARGET})
- endif()
+ set(COMPILER_RT_DEFAULT_TARGET_TRIPLE ${CMAKE_C_COMPILER_TARGET})
else()
- if ("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
- execute_process(COMMAND ${CMAKE_C_COMPILER} --target=${LLVM_TARGET_TRIPLE} -print-effective-triple
- OUTPUT_VARIABLE COMPILER_RT_DEFAULT_TARGET_TRIPLE
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- else()
- set(COMPILER_RT_DEFAULT_TARGET_TRIPLE ${LLVM_TARGET_TRIPLE} CACHE STRING
- "Default triple for which compiler-rt runtimes will be built.")
- endif()
+ set(COMPILER_RT_DEFAULT_TARGET_TRIPLE ${LLVM_TARGET_TRIPLE} CACHE STRING
+ "Default triple for which compiler-rt runtimes will be built.")
endif()
string(REPLACE "-" ";" LLVM_TARGET_TRIPLE_LIST ${COMPILER_RT_DEFAULT_TARGET_TRIPLE})
More information about the llvm-commits
mailing list