Skip to content

Commit c31e3b3

Browse files
committed
Runtimes: add support to emit variant modules
This leverages the SwiftDriver flag added in swiftlang/swift-driver#1941 Leave this disabled by default, so we can stage its adoption in Apple vendor configurations. Addresses rdar://158895783
1 parent 401b705 commit c31e3b3

File tree

3 files changed

+24
-0
lines changed

3 files changed

+24
-0
lines changed

Runtimes/Core/cmake/modules/CatalystSupport.cmake

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,12 @@ if(SwiftCore_COMPILER_VARIANT_TARGET)
4242
message(CONFIGURE_LOG "Swift target variant deployment version: ${SwiftCore_VARIANT_DEPLOYMENT_VERSION}")
4343
endif()
4444
endif()
45+
46+
if(SwiftCore_EXPERIMENTAL_EMIT_VARIANT_MODULE)
47+
check_compiler_flag(Swift "-experimental-emit-variant-module" HAVE_Swift_EMIT_VARIANT_MODULE_FLAG)
48+
if(HAVE_Swift_EMIT_VARIANT_MODULE_FLAG)
49+
add_compile_options(
50+
"$<$<COMPILE_LANGUAGE:Swift>:-experimental-emit-variant-module>")
51+
endif()
52+
endif()
4553
endif()

Runtimes/Overlay/cmake/modules/CatalystSupport.cmake

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,12 @@ if(${PROJECT_NAME}_COMPILER_VARIANT_TARGET)
3737
mark_as_advanced(${PROJECT_NAME}_VARIANT_MODULE_TRIPLE)
3838
message(CONFIGURE_LOG "Swift target variant module triple: ${module_triple}")
3939
endif()
40+
41+
if(${PROJECT_NAME}_EXPERIMENTAL_EMIT_VARIANT_MODULE)
42+
check_compiler_flag(Swift "-experimental-emit-variant-module" HAVE_Swift_EMIT_VARIANT_MODULE_FLAG)
43+
if(HAVE_Swift_EMIT_VARIANT_MODULE_FLAG)
44+
add_compile_options(
45+
"$<$<COMPILE_LANGUAGE:Swift>:-experimental-emit-variant-module>")
46+
endif()
47+
endif()
4048
endif()

Runtimes/Supplemental/cmake/modules/CatalystSupport.cmake

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,12 @@ if(${PROJECT_NAME}_COMPILER_VARIANT_TARGET)
3737
mark_as_advanced(${PROJECT_NAME}_VARIANT_MODULE_TRIPLE)
3838
message(CONFIGURE_LOG "Swift target variant module triple: ${module_triple}")
3939
endif()
40+
41+
if(${PROJECT_NAME}_EXPERIMENTAL_EMIT_VARIANT_MODULE)
42+
check_compiler_flag(Swift "-experimental-emit-variant-module" HAVE_Swift_EMIT_VARIANT_MODULE_FLAG)
43+
if(HAVE_Swift_EMIT_VARIANT_MODULE_FLAG)
44+
add_compile_options(
45+
"$<$<COMPILE_LANGUAGE:Swift>:-experimental-emit-variant-module>")
46+
endif()
47+
endif()
4048
endif()

0 commit comments

Comments
 (0)