[compiler-rt] 3da0658 - Revert "CompilerRT: Normalize COMPILER_RT_DEFAULT_TARGET_TRIPLE (#88835)"
David Spickett via llvm-commits
llvm-commits at lists.llvm.org
Thu Apr 18 03:51:30 PDT 2024
Author: David Spickett
Date: 2024-04-18T10:42:35Z
New Revision: 3da065896b1b59fd8291958e8d13f4a942d51214
URL: https://github.com/llvm/llvm-project/commit/3da065896b1b59fd8291958e8d13f4a942d51214
DIFF: https://github.com/llvm/llvm-project/commit/3da065896b1b59fd8291958e8d13f4a942d51214.diff
LOG: Revert "CompilerRT: Normalize COMPILER_RT_DEFAULT_TARGET_TRIPLE (#88835)"
This reverts commit 16f188761da1df6ba5e6627b8742aacfec8e9ec5.
This broke Libcxx Picolib testing at the install step, and builds
for Windows builtins. Revert while we figure out the cause.
Added:
Modified:
compiler-rt/cmake/Modules/CompilerRTUtils.cmake
Removed:
################################################################################
diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake
index 6d413f6753bc0c..e8e5f612d5b03c 100644
--- a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake
+++ b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake
@@ -368,12 +368,6 @@ macro(construct_compiler_rt_default_triple)
"Default triple for which compiler-rt runtimes will be built.")
endif()
- if ("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
- execute_process(COMMAND ${CMAKE_C_COMPILER} --target=${COMPILER_RT_DEFAULT_TARGET_TRIPLE} -print-effective-triple
- OUTPUT_VARIABLE COMPILER_RT_DEFAULT_TARGET_TRIPLE
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- endif()
-
string(REPLACE "-" ";" LLVM_TARGET_TRIPLE_LIST ${COMPILER_RT_DEFAULT_TARGET_TRIPLE})
list(GET LLVM_TARGET_TRIPLE_LIST 0 COMPILER_RT_DEFAULT_TARGET_ARCH)
More information about the llvm-commits
mailing list