Skip to content

Add msystem support on msys2#6884

Merged
waruqi merged 2 commits intoxmake-io:devfrom
star-hengxing:msys2
Oct 4, 2025
Merged

Add msystem support on msys2#6884
waruqi merged 2 commits intoxmake-io:devfrom
star-hengxing:msys2

Conversation

@star-hengxing
Copy link
Contributor

No description provided.

@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello @star-hengxing, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request significantly improves Xmake's ability to detect and configure MinGW toolchains, particularly within MSYS2 environments. By adding explicit support for the msystem concept, Xmake can now accurately differentiate and locate specific MinGW installations (like mingw32 or mingw64), leading to more robust and reliable build setups on Windows.

Highlights

  • MSYS2 msystem support: Introduced a new msystem parameter to the MinGW detection functions to explicitly support different MSYS2 environments (e.g., mingw32, mingw64).
  • Dynamic SDK path adjustment: The _find_mingwdir function now dynamically adjusts the MinGW SDK directory path based on the provided msystem for MSYS2 subhosts, ensuring the correct environment is located.
  • Enhanced cache precision: The MinGW SDK detection cache now considers the msystem parameter, preventing incorrect cache hits when switching between different MSYS2 environments.
  • Toolchain configuration integration: The msystem configuration is now passed from the toolchain check to the find_mingw function, ensuring consistent detection across the build system.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request adds support for msystem on msys2, allowing for better detection and switching of MingW environments. The changes correctly propagate the msystem parameter through the detection logic and to the toolchain configuration. However, I've identified a significant issue in the caching logic that could lead to incorrect cache hits. My review includes a specific suggestion to fix this bug.

local key = "detect.sdks.find_mingw"
local cacheinfo = detectcache:get(key) or {}
if not opt.force and cacheinfo.mingw and cacheinfo.mingw.sdkdir and os.isdir(cacheinfo.mingw.sdkdir) then
if not opt.force and cacheinfo.mingw and cacheinfo.mingw.sdkdir and os.isdir(cacheinfo.mingw.sdkdir) and cacheinfo.msystem == opt.msystem then
Copy link
Contributor

Choose a reason for hiding this comment

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

high

The cache validation logic for msystem is incorrect. It checks cacheinfo.msystem, but the msystem value is stored within the cacheinfo.mingw table. This can lead to incorrect cache hits, for example when switching from a specific msystem to a default one (nil).

The check should be performed on cacheinfo.mingw.msystem to ensure the cache is correctly invalidated when msystem changes.

    if not opt.force and cacheinfo.mingw and cacheinfo.mingw.sdkdir and os.isdir(cacheinfo.mingw.sdkdir) and cacheinfo.mingw.msystem == opt.msystem then

Copy link
Member

Choose a reason for hiding this comment

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

这里不对,应该是 cacheinfo.mingw.msystem

@waruqi waruqi added this to the v3.0.4 milestone Oct 4, 2025
@waruqi waruqi merged commit 82f581a into xmake-io:dev Oct 4, 2025
22 checks passed
@star-hengxing star-hengxing deleted the msys2 branch October 5, 2025 03:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants