Skip to content

22.x: Fix LW.dll packaging when LLVM_DISTRIBUTION_COMPONENTS is used on Windows (#2162) - #2167

Merged
Shankar Easwaran (quic-seaswara) merged 1 commit into
qualcomm:release/22.xfrom
jonathonpenix:pr/22.x/lw_dll_fix
Oct 15, 2026
Merged

Shankar Easwaran (quic-seaswara) merged 1 commit into
qualcomm:release/22.xfrom
jonathonpenix:pr/22.x/lw_dll_fix

Conversation

@jonathonpenix

Copy link
Copy Markdown
Contributor

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)

…on Windows (qualcomm#2162)

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>
@jonathonpenix

Copy link
Copy Markdown
Contributor Author

Tested on the cpullvm 22.x side in https://github.com/qualcomm/cpullvm-toolchain/actions/runs/38647560659?pr=703 (x86 timeout is unrelated)

@quic-seaswara
Shankar Easwaran (quic-seaswara) merged commit fccabe0 into qualcomm:release/22.x Oct 15, 2026
5 of 6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants