[CMake] Fix issues when running build-tooling-libs
#61683
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There were three different issues going on here, all of these were triggered by swiftlang#61618 which stared including `AST/AnyFunctionRef.h` from the ASTBridging modulemap - We did not find the clang include dirs because the unified build that build-tooling-libs is using does not import ClangConfig, setting `CLANG_INCLUDE_DIRS` in `swift_common_unified_build_config` fixed this problem. - Some of the headers in `swift-ast-generated-headers` import generated headers from clang that might not have been created yet. Making `swift-ast-generated-headers` depend on the clang generated headers fixes this problem. This just lowers the dependency because `swiftAST` depends on `swift-ast-generated-headers` - If a Swift compiler from Xcode is used, the SwiftShims don’t live next to the compiler but in the SDK. Adding the SDKs lib to the include paths fixes this problem
|
@swift-ci Please smoke test |
egorzhdan
reviewed
Oct 22, 2022
| get_filename_component(swift_exec_bin_dir ${ALS_SWIFT_EXEC} DIRECTORY) | ||
| set(sdk_option ${sdk_option} "-I" "${swift_exec_bin_dir}/../lib") | ||
| set(sdk_option ${sdk_option} "-I" "${swift_exec_bin_dir}/../lib" "-I" "${sdk_path}/usr/lib") |
There was a problem hiding this comment.
Hmm, does this mean we'll include two copies of SwiftShims when using an open source toolchain with an SDK from Xcode? If that's true, can we instead add only one of these two directories if both exist?
There was a problem hiding this comment.
I have done that locally and it worked just fine. I assume that it just chooses the first include path that it finds.
There was a problem hiding this comment.
That makes sense, thanks.
egorzhdan
approved these changes
Oct 22, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There were three different issues going on here, all of these were triggered by #61618 which stared including
AST/AnyFunctionRef.hfrom the ASTBridging modulemapCLANG_INCLUDE_DIRSinswift_common_unified_build_configfixed this problem.swift-ast-generated-headersimport generated headers from clang that might not have been created yet. Makingswift-ast-generated-headersdepend on the clang generated headers fixes this problem. This just lowers the dependency becauseswiftASTdepends onswift-ast-generated-headers