Skip to content

Commit 11c66ba

Browse files
committed
[cling] Remove hack for unsupported versions of LLVM and MacOS
Current ROOT does not support MacOS 13 and LLVM18, so the hack can now be removed.
1 parent aecad0a commit 11c66ba

3 files changed

Lines changed: 4 additions & 1709 deletions

File tree

core/clingutils/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,7 @@ if (runtime_cxxmodules)
119119

120120
# We need to override the default modulemap because instead of producing a
121121
# single std.pcm, produces hundreds of pcms. This changed with MacOSX14.4.sdk
122-
# To support macOS 13 with LLVM 18, we need to patch the modulemap from
123-
# MacOSX14.2.sdk
124122
if (APPLE)
125-
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0.0.15000309)
126-
set(custom_modulemaps ${custom_modulemaps} std_darwin.MacOSX14.2.sdk.modulemap)
127-
else()
128123
set(GENERATED_MODULEMAP ${CMAKE_CURRENT_BINARY_DIR}/std_darwin.modulemap)
129124

130125
add_custom_command(
@@ -137,7 +132,6 @@ if (runtime_cxxmodules)
137132
list(APPEND copy_commands COMMAND ${CMAKE_COMMAND} -E copy ${GENERATED_MODULEMAP} ${CMAKE_BINARY_DIR}/etc/cling/std_darwin.modulemap)
138133
list(APPEND files_to_copy ${GENERATED_MODULEMAP})
139134
install(FILES ${CMAKE_BINARY_DIR}/etc/cling/std_darwin.modulemap DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/cling)
140-
endif()
141135
endif()
142136

143137
if (NOT libcxx)

0 commit comments

Comments
 (0)