[compiler-rt] [CMake] Fix compiler-rt builtins configuration bug on darwin (PR #173811)
Alex Dutka via llvm-commits
llvm-commits at lists.llvm.org
Mon Jan 5 00:43:49 PST 2026
https://github.com/dutkalex updated https://github.com/llvm/llvm-project/pull/173811
>From c26d1b65f43d62f1a5147a8b21f0c1e0075988ff Mon Sep 17 00:00:00 2001
From: Alex Dutka <97711898+dutkalex at users.noreply.github.com>
Date: Mon, 29 Dec 2025 02:43:21 +0100
Subject: [PATCH] check if i386 support should be removed unconditionally
---
.../cmake/Modules/CompilerRTDarwinUtils.cmake | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
index c6777bda9f0d1..b670b5ad51cc3 100644
--- a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
+++ b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
@@ -120,16 +120,16 @@ function(darwin_test_archs os valid_archs)
foreach(flag ${DARWIN_${os}_LINK_FLAGS})
set(os_linker_flags "${os_linker_flags} ${flag}")
endforeach()
+ endif()
- # Disable building for i386 for macOS SDK >= 10.15. The SDK doesn't support
- # linking for i386 and the corresponding OS doesn't allow running macOS i386
- # binaries.
- if ("${os}" STREQUAL "osx")
- find_darwin_sdk_version(macosx_sdk_version "macosx")
- if ("${macosx_sdk_version}" VERSION_GREATER 10.15 OR "${macosx_sdk_version}" VERSION_EQUAL 10.15)
- message(STATUS "Disabling i386 slice for ${valid_archs}")
- list(REMOVE_ITEM archs "i386")
- endif()
+ # Disable building for i386 for macOS SDK >= 10.15. The SDK doesn't support
+ # linking for i386 and the corresponding OS doesn't allow running macOS i386
+ # binaries.
+ if ("${os}" STREQUAL "osx")
+ find_darwin_sdk_version(macosx_sdk_version "macosx")
+ if ("${macosx_sdk_version}" VERSION_GREATER 10.15 OR "${macosx_sdk_version}" VERSION_EQUAL 10.15)
+ message(STATUS "Disabling i386 slice for ${valid_archs}")
+ list(REMOVE_ITEM archs "i386")
endif()
endif()
More information about the llvm-commits
mailing list