ci: ensure LLVM_CMAKE_FLAGS additions are kept#337
Merged
abrown merged 1 commit intoWebAssembly:mainfrom Jul 28, 2023
Merged
Conversation
In WebAssembly#321, some OSX-specific `Makefile` additions to `LLVM_CMAKE_FLAGS` were skipped unless `make` is run on a Darwin OS. This allowed building wasi-sdk for aarch64. But, as reported in WebAssembly#336, this also broke arm64/x86_64 universal binaries that are built during CI. The reason for this is that CI's `main.yml` overrides `LLVM_CMAKE_FLAGS` to add caching but `make` will not append to a variable set on the command line. This changes uses the `override` keyword to append to such a variable, as suggested [here]. [here]: https://www.gnu.org/software/make/manual/html_node/Override-Directive.html
TerrorJack
approved these changes
Jul 27, 2023
Contributor
TerrorJack
left a comment
TerrorJack
left a comment
There was a problem hiding this comment.
til about the override keyword in makefiles, thanks for the fix! macos build log shows -arch arm64 -arch x86_64 in the llvm build flags so i believe this is a valid fix.
Collaborator
Author
|
Credit to @sunfishcode for recommending |
sbc100
approved these changes
Jul 27, 2023
Collaborator
Author
|
Ok, looking at the artifacts for this PR's run, |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
In #321, some OSX-specific
Makefileadditions toLLVM_CMAKE_FLAGSwere skipped unlessmakeis run on a Darwin OS. This allowed building wasi-sdk for aarch64. But, as reported in #336, this also broke arm64/x86_64 universal binaries that are built during CI.The reason for this is that CI's
main.ymloverridesLLVM_CMAKE_FLAGSto add caching butmakewill not append to a variable set on the command line. This changes uses theoverridekeyword to append to such a variable, as suggested here.