Enable compiler subprojects on Windows. #95
Merged
Conversation
This file contains 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
ScottTodd
force-pushed
the
windows-compiler
branch
from
9528b43 to
0543ebd
Compare
ScottTodd
commented
Feb 15, 2025
Comment on lines
+21
to
+23
| + # Enable standards-conforming preprocessor. | ||
| + # https://learn.microsoft.com/en-us/cpp/build/reference/zc-preprocessor | ||
| + "/Zc:preprocessor" |
There was a problem hiding this comment.
Clues that helped settle on this fix:
- https://github.com/llvm/llvm-project/blob/60af83506a3aa379c59e0f9793ce7815d726aee1/llvm/cmake/modules/HandleLLVMOptions.cmake#L594-L598
- [Issue]: comgr.cpp compilation error ROCm/llvm-project#38 (this had the same error messages that I saw when building locally)
Should upstream the patch somehow.
There was a problem hiding this comment.
Yeah, ping the LLVM team next week. Thanks for the sleuthing.
stellaraccident
approved these changes
Feb 15, 2025
compiler/CMakeLists.txt
Outdated
| therock_cmake_subproject_declare(amd-comgr | ||
| EXTERNAL_SOURCE_DIR "amd-llvm/amd/comgr" | ||
| BINARY_DIR "amd-comgr" | ||
| BACKGROUND_BUILD | ||
| CMAKE_ARGS | ||
| # TODO: Currently unstable. Enable in >6.4. | ||
| -DCOMGR_DISABLE_SPIRV=ON | ||
| -DLLVM_LINK_LLVM_DYLIB=ON | ||
| -DLLVM_LINK_LLVM_DYLIB=${_link_dylib} |
There was a problem hiding this comment.
You can just take this out and put it all properly conditioned in the pre_hook.
There was a problem hiding this comment.
(I think this was just leftover from before I moved all of the logic there)
There was a problem hiding this comment.
How's this? Want
CMAKE_ARGS
# TODO: Currently unstable. Enable in >6.4.
-DCOMGR_DISABLE_SPIRV=ONmoved too?
Comment on lines
+21
to
+23
| + # Enable standards-conforming preprocessor. | ||
| + # https://learn.microsoft.com/en-us/cpp/build/reference/zc-preprocessor | ||
| + "/Zc:preprocessor" |
There was a problem hiding this comment.
Yeah, ping the LLVM team next week. Thanks for the sleuthing.
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.
Progress on #36.
We'll want to switch to self-hosted runners and tune the cache to make the build faster soon. This is still under 20 minutes on standard runners though: https://github.com/nod-ai/TheRock/actions/runs/13339298280/job/37260996314.