CMake: Specify modern Cxx interop flag when building SwiftCompilerSources #72033
Conversation
|
The linux CI still uses Swift 5.8, swiftlang/swift-docker#368. |
tshortli
force-pushed
the
swift-compiler-sources-cxx-interop-flag
branch
from
acbe1eb to
83fe59b
Compare
Darn, looks like I'll need to conditionalize it then. It appears we've already handled this in the ASTGen module. |
tshortli
changed the title
…rces. When building with a Swift 5.9 toolchain, we can specify the `-cxx-interoperability-mode` flag instead of the deprecated `-enable-experimental-cxx-interop` flag.
tshortli
force-pushed
the
swift-compiler-sources-cxx-interop-flag
branch
from
83fe59b to
066b6d1
Compare
|
@swift-ci please test |
| @@ -98,10 +98,17 @@ function(add_swift_compiler_modules_library name) | |||
| "DEPENDS" | |||
| ${ARGN}) | |||
|
|
|||
| # Prior to 5.9, we have to use the experimental flag for C++ interop. | |||
| if (CMAKE_Swift_COMPILER_VERSION VERSION_LESS 5.9) | |||
There was a problem hiding this comment.
I don't think CMAKE_Swift_COMPILER_VERSION is valid unless we're building with hosttools. Last time I checked it was empty when bootstrapping is enabled since we aren't using CMake's built-in Swift support in that case. @eeckstein knows more about this.
There was a problem hiding this comment.
Perhaps this can be further refined to check something that indicates whether we are bootstrapping and specify -cxx-interoperability-mode=default when we are. Lmk if that sounds reasonable.
There was a problem hiding this comment.
That would make sense to me!
There was a problem hiding this comment.
I wouldn't bother with it. Bootstrapping is on life support and not even checked on the official CI: hosttools are de facto required at this point, with bootstrapping soon to be removed.
There was a problem hiding this comment.
Ok, given that assessment of bootstrapping, the fact that CI passed, and that this approach matches ASTGen I'm inclined to land it as-is. I think the failure case is just that we pass the deprecated flag when bootstrapping?
When building with a Swift 5.9 toolchain, we can specify the
-cxx-interoperability-modeflag instead of the deprecated-enable-experimental-cxx-interopflag.