Repository navigation
Fix LW.dll packaging when LLVM_DISTRIBUTION_COMPONENTS is used on Windows - #2162
Merged
Shankar Easwaran (quic-seaswara) merged 1 commit intoOct 15, 2026
Merged
Conversation
…dows I messed up when originally adding this--the `COMPONENT ld.eld` part attaches specifically to the `ARCHIVE DESTINATION lib` artifact kind rather than both `ARCHIVE` and `RUNTIME` lines. So the `RUNTIME` line isn't included when the `ld.eld` COMPONENT is included in the final package if `LLVM_DISTRIBUTION_COMPONENTS` is used. To fix this, re-order the lines--when it appears first, it apparently applies to all the artifact kinds. We could also duplicate the `COMPONENT` bit for each artifact kind, but that seems a bit verbose. Signed-off-by: Jonathon Penix <jpenix@qti.qualcomm.com>
Jonathon Penix (jonathonpenix)
changed the title
LLVM_DISTRIBUTION_COMPONENTS is used on Windows
Jonathon Penix (jonathonpenix)
marked this pull request as ready for review
October 15, 2026 17:16
Jonathon Penix (jonathonpenix)
requested a review
from Shankar Easwaran (quic-seaswara)
as a code owner
October 15, 2026 17:16
Jonathon Penix (jonathonpenix)
requested review from
Steven Ramirez Rosa (Steven6798) and
Shakti Suman (quic-shaksuma)
October 15, 2026 17:17
Shankar Easwaran (quic-seaswara)
approved these changes
Oct 15, 2026
Steven Ramirez Rosa (Steven6798)
approved these changes
Oct 15, 2026
Shankar Easwaran (quic-seaswara)
merged commit Oct 15, 2026
f008fac
into
qualcomm:main
28 checks passed
Contributor
Author
|
Our cpullvm mainline builders are seeing unrelated failures currently, but this seems to work as expected when built against ex: 22.x. See Windows toolchains generated in https://github.com/qualcomm/cpullvm-toolchain/actions/runs/38647560659?pr=703 (x86 timeout is unrelated) |
Shankar Easwaran (quic-seaswara)
pushed a commit
that referenced
this pull request
Oct 15, 2026
…on Windows (#2162) (#2167) I messed up when originally adding this--the `COMPONENT ld.eld` part attaches specifically to the `ARCHIVE DESTINATION lib` artifact kind rather than both `ARCHIVE` and `RUNTIME` lines. So the `RUNTIME` line isn't included when the `ld.eld` COMPONENT is included in the final package if `LLVM_DISTRIBUTION_COMPONENTS` is used. To fix this, re-order the lines--when it appears first, it apparently applies to all the artifact kinds. We could also duplicate the `COMPONENT` bit for each artifact kind, but that seems a bit verbose. (cherry picked from commit f008fac) Signed-off-by: Jonathon Penix <jpenix@qti.qualcomm.com>
Shankar Easwaran (quic-seaswara)
pushed a commit
that referenced
this pull request
Oct 15, 2026
…on Windows (#2162) (#2168) I messed up when originally adding this--the `COMPONENT ld.eld` part attaches specifically to the `ARCHIVE DESTINATION lib` artifact kind rather than both `ARCHIVE` and `RUNTIME` lines. So the `RUNTIME` line isn't included when the `ld.eld` COMPONENT is included in the final package if `LLVM_DISTRIBUTION_COMPONENTS` is used. To fix this, re-order the lines--when it appears first, it apparently applies to all the artifact kinds. We could also duplicate the `COMPONENT` bit for each artifact kind, but that seems a bit verbose. (cherry picked from commit f008fac) Signed-off-by: Jonathon Penix <jpenix@qti.qualcomm.com>
Shankar Easwaran (quic-seaswara)
pushed a commit
that referenced
this pull request
Oct 15, 2026
…COMPONENTS is used on Windows (#2162) (#2169) I messed up when originally adding this--the `COMPONENT ld.eld` part attaches specifically to the `ARCHIVE DESTINATION lib` artifact kind rather than both `ARCHIVE` and `RUNTIME` lines. So the `RUNTIME` line isn't included when the `ld.eld` COMPONENT is included in the final package if `LLVM_DISTRIBUTION_COMPONENTS` is used. To fix this, re-order the lines--when it appears first, it apparently applies to all the artifact kinds. We could also duplicate the `COMPONENT` bit for each artifact kind, but that seems a bit verbose. (cherry picked from commit f008fac) Signed-off-by: Jonathon Penix <jpenix@qti.qualcomm.com>
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.
I messed up when originally adding this in #740 --the
COMPONENT ld.eldpart attaches specifically to theARCHIVE DESTINATION libartifact kind rather than bothARCHIVEandRUNTIMEkinds. So theRUNTIMEkind isn't included in the final package/distribution when theld.eldCOMPONENTis used inLLVM_DISTRIBUTION_COMPONENTS.To fix this, re-order the lines--when it appears first, it applies to all the artifact kinds if they don't have something else specified.
We could also duplicate the
COMPONENTbit for each artifact kind, but that seems a bit verbose.Assisted-by: claude