Fix bootstrap for certain macOS environments
#5961
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
Not sure what has caused this, possibly underlying CMake changes, but I am seeing linker errors related to missing linkage of the C++ standard library recently. This changes `bootstrap` to explicitly inject into linker flags when building llbuild to avoid the problem.
Contributor
Author
|
@swift-ci please smoke test |
elsh
approved these changes
Dec 9, 2022
tomerd
reviewed
Dec 21, 2022
| # ----------------------------------------------------------- | ||
|
|
||
| def build_with_cmake(args, cmake_args, ninja_args, source_path, build_dir): | ||
| def build_with_cmake(args, cmake_args, ninja_args, source_path, build_dir, cmake_env = []): |
Contributor
There was a problem hiding this comment.
nit: args, cmake_args, cmake_env = [], ninja_args, source_path, build_dir
Contributor
Author
There was a problem hiding this comment.
not possible afaik, python doesn't allow non-default args after args with default values
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.
Not sure what has caused this, possibly underlying CMake changes, but I am seeing linker errors related to missing linkage of the C++ standard library recently. This changes
bootstrapto explicitly inject into linker flags when building llbuild to avoid the problem.