[compiler-rt] 75325c6 - [Darwin][CompilerRT] Set compiler ID to 'Clang' for Compiler RT Tests for Apple Clang (#121858)
via llvm-commits
llvm-commits at lists.llvm.org
Tue Jan 7 13:19:58 PST 2025
Author: thetruestblue
Date: 2025-01-07T13:19:55-08:00
New Revision: 75325c658e1f2dc81557cf4db9206310ae90c27f
URL: https://github.com/llvm/llvm-project/commit/75325c658e1f2dc81557cf4db9206310ae90c27f
DIFF: https://github.com/llvm/llvm-project/commit/75325c658e1f2dc81557cf4db9206310ae90c27f.diff
LOG: [Darwin][CompilerRT] Set compiler ID to 'Clang' for Compiler RT Tests for Apple Clang (#121858)
This patch restores previous behavior. Even when the Compiler ID is set
to AppleClang, we expect Compiler RT Tests to use Clang as the compiler
ID. This impacts various make and lit commands.
Caused by: https://github.com/llvm/llvm-project/pull/117812/files
rdar://141548700
Added:
Modified:
compiler-rt/cmake/base-config-ix.cmake
Removed:
################################################################################
diff --git a/compiler-rt/cmake/base-config-ix.cmake b/compiler-rt/cmake/base-config-ix.cmake
index 9717c21d8977bd..d92bc0e71fa1a8 100644
--- a/compiler-rt/cmake/base-config-ix.cmake
+++ b/compiler-rt/cmake/base-config-ix.cmake
@@ -89,6 +89,11 @@ else()
set(COMPILER_RT_TEST_COMPILER_ID GNU)
endif()
+# AppleClang expects 'Clang' as compiler-rt test compiler ID.
+if ("${COMPILER_RT_TEST_COMPILER_ID}" STREQUAL "AppleClang")
+ set(COMPILER_RT_TEST_COMPILER_ID Clang)
+endif()
+
if(NOT DEFINED COMPILER_RT_OS_DIR)
if(ANDROID)
# The CMAKE_SYSTEM_NAME for Android is Android, but the OS is Linux and the
More information about the llvm-commits
mailing list