Skip to content

release/21.x: [flang-rt] Use correct flang-rt build for flang-rt unit tests on Windows (#152318) #152493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 8, 2025

Conversation

llvmbot
Copy link
Member

@llvmbot llvmbot commented Aug 7, 2025

Backport f73a302

Requested by: @DavidTruby

@llvmbot
Copy link
Member Author

llvmbot commented Aug 7, 2025

@Meinersbur What do you think about merging this PR to the release branch?

Copy link
Member

@Meinersbur Meinersbur left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@github-project-automation github-project-automation bot moved this from Needs Triage to Needs Merge in LLVM Release Status Aug 7, 2025
…ows (llvm#152318)

Currrently flang-rt assumes that LLVM was always built with the dynamic
MSVC runtime. This may not be the case, if the user has specified a
different runtime with -DCMAKE_MSVC_RUNTIME_LIBRARY. Since this flag is
implied by -DLLVM_ENABLE_RPMALLOC=On, which is used by the Windows
release script, this is causing that script to fail.

Fixes llvm#151920

(cherry picked from commit f73a302)
@tru tru merged commit 2555a85 into llvm:release/21.x Aug 8, 2025
1 check was pending
@github-project-automation github-project-automation bot moved this from Needs Merge to Done in LLVM Release Status Aug 8, 2025
Copy link

github-actions bot commented Aug 8, 2025

@DavidTruby (or anyone else). If you would like to add a note about this fix in the release notes (completely optional). Please reply to this comment with a one or two sentence description of the fix. When you are done, please add the release:note label to this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

4 participants