@@ -126,22 +126,18 @@ if (runtime_cxxmodules)
126126 # To support macOS 13 with LLVM 18, we need to patch the modulemap from
127127 # MacOSX14.2.sdk
128128 if (APPLE )
129- if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0.0.15000309)
130- set (custom_modulemaps ${custom_modulemaps} std_darwin.MacOSX14.2.sdk.modulemap)
131- else ()
132- set (GENERATED_MODULEMAP ${CMAKE_CURRENT_BINARY_DIR} /std_darwin.modulemap)
133-
134- add_custom_command (
135- OUTPUT ${GENERATED_MODULEMAP}
136- COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR} /cmake/scripts/std_modulemap_darwin_fix.py ${GENERATED_MODULEMAP}
137- DEPENDS ${PROJECT_SOURCE_DIR} /cmake/scripts/std_modulemap_darwin_fix.py
138- COMMENT "Generating wrapped std modulemap for macOS SDK"
139- )
140- add_custom_target (generate_std_modulemap DEPENDS ${GENERATED_MODULEMAP} )
141- list (APPEND copy_commands COMMAND ${CMAKE_COMMAND} -E copy ${GENERATED_MODULEMAP} ${CMAKE_BINARY_DIR} /etc/cling/std_darwin.modulemap)
142- list (APPEND files_to_copy ${GENERATED_MODULEMAP} )
143- install (FILES ${CMAKE_BINARY_DIR} /etc/cling/std_darwin.modulemap DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} /cling)
144- endif ()
129+ set (GENERATED_MODULEMAP ${CMAKE_CURRENT_BINARY_DIR} /std_darwin.modulemap)
130+
131+ add_custom_command (
132+ OUTPUT ${GENERATED_MODULEMAP}
133+ COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR} /cmake/scripts/std_modulemap_darwin_fix.py ${GENERATED_MODULEMAP}
134+ DEPENDS ${PROJECT_SOURCE_DIR} /cmake/scripts/std_modulemap_darwin_fix.py
135+ COMMENT "Generating wrapped std modulemap for macOS SDK"
136+ )
137+ add_custom_target (generate_std_modulemap DEPENDS ${GENERATED_MODULEMAP} )
138+ list (APPEND copy_commands COMMAND ${CMAKE_COMMAND} -E copy ${GENERATED_MODULEMAP} ${CMAKE_BINARY_DIR} /etc/cling/std_darwin.modulemap)
139+ list (APPEND files_to_copy ${GENERATED_MODULEMAP} )
140+ install (FILES ${CMAKE_BINARY_DIR} /etc/cling/std_darwin.modulemap DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} /cling)
145141 endif ()
146142
147143 if (NOT libcxx)
0 commit comments