File tree Expand file tree Collapse file tree 2 files changed +10
-6
lines changed Expand file tree Collapse file tree 2 files changed +10
-6
lines changed Original file line number Diff line number Diff line change @@ -58,8 +58,12 @@ endif()
5858if (NOT DEFINED SWIFTSYNTAX_EMIT_MODULE)
5959 set (SWIFTSYNTAX_EMIT_MODULE TRUE )
6060endif ()
61- if (SWIFTSYNTAX_EMIT_MODULE)
62- swift_get_package_cmo_support(SWIFT_PACKAGE_CMO_SUPPORT)
61+
62+ if (NOT DEFINED Swift_COMPILER_PACKAGE_CMO_SUPPORT AND SWIFTSYNTAX_EMIT_MODULE)
63+ swift_get_package_cmo_support(Swift_COMPILER_PACKAGE_CMO_SUPPORT)
64+ endif ()
65+ if (NOT DEFINED SWIFTSYNTAX_PACKAGE_NAME)
66+ set (SWIFTSYNTAX_PACKAGE_NAME "${SWIFT_MODULE_ABI_NAME_PREFIX}${PROJECT_NAME} " )
6367endif ()
6468
6569# Determine the module triple.
Original file line number Diff line number Diff line change @@ -81,17 +81,17 @@ function(add_swift_syntax_library name)
8181 >)
8282
8383 # Enable package CMO if possible.
84- if (SWIFT_PACKAGE_CMO_SUPPORT STREQUAL "IMPLEMENTED" )
84+ if (Swift_COMPILER_PACKAGE_CMO_SUPPORT STREQUAL "IMPLEMENTED" )
8585 target_compile_options ("${target} " PRIVATE
8686 $<$<COMPILE_LANGUAGE:Swift>:
87- "SHELL:-package-name ${SWIFT_MODULE_ABI_NAME_PREFIX}${PROJECT_NAME } "
87+ "SHELL:-package-name ${SWIFTSYNTAX_PACKAGE_NAME } "
8888 "SHELL:-Xfrontend -package-cmo"
8989 "SHELL:-Xfrontend -allow-non-resilient-access"
9090 >)
91- elseif (SWIFT_PACKAGE_CMO_SUPPORT STREQUAL "EXPERIMENTAL" )
91+ elseif (Swift_COMPILER_PACKAGE_CMO_SUPPORT STREQUAL "EXPERIMENTAL" )
9292 target_compile_options ("${target} " PRIVATE
9393 $<$<COMPILE_LANGUAGE:Swift>:
94- "SHELL:-package-name ${SWIFT_MODULE_ABI_NAME_PREFIX}${PROJECT_NAME } "
94+ "SHELL:-package-name ${SWIFTSYNTAX_PACKAGE_NAME } "
9595 "SHELL:-Xfrontend -experimental-package-cmo"
9696 "SHELL:-Xfrontend -experimental-allow-non-resilient-access"
9797 "SHELL:-Xfrontend -experimental-package-bypass-resilience"
You can’t perform that action at this time.
0 commit comments