runtimes: add Android search handling for SwiftCore #81920
Conversation
This updates the search handling to account for Android SDK searches on Windows. This is required to repair the nightly builds.
compnerd
requested review from
etcwilde,
edymtt and
justice-adams-apple
as code owners
|
@swift-ci please smoke test |
|
I think this is fine. That said, if we have the CMake generated config file, should we default these builds to use that instead with CMAKE_FIND_PACKAGE_PREFER_CONFIG? Then CMake will pick the config file up automatically as long as the install directories are kept consistent. |
|
Yes, I think that if possible, we should prefer the config files. |
|
@swift-ci please smoke test Linux platform |
|
@swift-ci please smoke test macOS platform |
| if(BUILD_SHARED_LIBS) | ||
| find_path(SwiftCore_INCLUDE_DIR | ||
| "Swift.swiftmodule" | ||
| NO_CMAKE_FIND_ROOT_PATH |
There was a problem hiding this comment.
To double check my understanding: are you using NO_CMAKE_FIND_ROOT_PATH to signal that we are not mixing and matching target and host environments?
There was a problem hiding this comment.
No, this is required to ensure that we do not mix and match the Android sysroot and the Swift sysroot. When building for Android, we would search for the path "[Android sysroot][Swift sysroot]" which would not exist as the paths are concatenated.
This updates the search handling to account for Android SDK searches on Windows. This is required to repair the nightly builds.