Simplified clang detection in ruby for workaround in macos.

metacall · Aug 9, 2022 · b10b515 · b10b515
1 parent 5d6006c
commit b10b515
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/source/loaders/rb_loader/CMakeLists.txt b/source/loaders/rb_loader/CMakeLists.txt
@@ -190,14 +190,11 @@ target_compile_options(${target}
 
 # Fix Ruby MacOSX LLVM bug 
 # '__declspec' attributes are not enabled; use '-fdeclspec' or '-fms-extensions' to enable support for __declspec attributes
-
 include(Portability)
-if("${PROJECT_OS_FAMILY}" STREQUAL "macos" )
-	if("${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang*" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
-		target_compile_options(${target} PRIVATE "-fdeclspec")
-	endif()
-endif()
 
+if("${PROJECT_OS_FAMILY}" STREQUAL "macos" AND CMAKE_C_COMPILER_ID MATCHES "Clang")
+	target_compile_options(${target} PRIVATE "-fdeclspec")
+endif()
 
 #
 # Linker options

diff --git a/source/ports/rb_port/CMakeLists.txt b/source/ports/rb_port/CMakeLists.txt
@@ -223,14 +223,11 @@ target_compile_options(${SWIG_MODULE_${target}_REAL_NAME}
 
 # Fix Ruby MacOSX LLVM bug 
 # '__declspec' attributes are not enabled; use '-fdeclspec' or '-fms-extensions' to enable support for __declspec attributes
-
 include(Portability)
-if("${PROJECT_OS_FAMILY}" STREQUAL "macos" )
-	if("${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang*" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
-		target_compile_options(${target} PRIVATE "-fdeclspec")
-	endif()
-endif()
 
+if("${PROJECT_OS_FAMILY}" STREQUAL "macos" AND CMAKE_C_COMPILER_ID MATCHES "Clang")
+	target_compile_options(${target} PRIVATE "-fdeclspec")
+endif()
 
 #
 # Linker options