[compiler-rt] [Darwin][CompilerRT] Set compiler ID to 'Clang' for Compiler RT Tests for Apple Clang (PR #121858)
via llvm-commits
llvm-commits at lists.llvm.org
Tue Jan 7 09:25:38 PST 2025
https://github.com/thetruestblue updated https://github.com/llvm/llvm-project/pull/121858
>From a97a8c833c371d1f51b71e7421b4ec0acff1ab9a Mon Sep 17 00:00:00 2001
From: thetruestblue <bgaston2 at apple.com>
Date: Mon, 6 Jan 2025 15:49:02 -0800
Subject: [PATCH] [Darwin][CompilerRT] Set compiler ID to 'Clang' for Compiler
RT Tests
This patch restores previous behavior we relied on. 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
---
compiler-rt/cmake/base-config-ix.cmake | 5 +++++
1 file changed, 5 insertions(+)
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