Skip to content

Conversation

rickeylev
Copy link
Collaborator

@rickeylev rickeylev commented Oct 2, 2025

The musl/freethreaded runtimes weren't being activated when the flags were set. This was
because the toolchains weren't having target_settings set, which means extra settings,
such as musl/freethreaded-ness were ignored when matching. The net result is the regular
toolchain, because it's registered earlier, would always match earlier.

To fix, set the target_settings in the toolchain() call. This matches the bzlmod behavior.

Also update the toolchain resolution tests to verify resolution.

Fixes #3262

Copy link
Contributor

Summary of Changes

Hello @rickeylev, 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 resolves a critical issue where musl and freethreaded Python runtimes were not being properly activated in Bazel WORKSPACE builds. The core problem stemmed from missing target_settings in toolchain registrations, which led to incorrect toolchain matching. The fix involves explicitly setting these target_settings to align with bzlmod behavior, ensuring that specific runtime variants are correctly identified and used. Additionally, new robust tests have been introduced to validate toolchain resolution for these variants, alongside a refactoring of test platform definitions for better maintainability.

Highlights

  • Toolchain Resolution Fix: Correctly registers musl and freethreaded Python toolchains for WORKSPACE builds by setting target_settings in the toolchain() calls, which was previously missing.
  • Improved Toolchain Matching: Ensures that when --py_linux_libc=musl or --py_freethreaded=yes flags are used, the appropriate toolchains are activated, preventing the default toolchain from being incorrectly matched.
  • New Resolution Tests: Adds comprehensive toolchain resolution tests to verify the correct activation of musl and freethreaded variants across various platforms and Python versions.
  • Test Infrastructure Refactoring: Consolidates platform definitions into a new dedicated tests/support/platforms directory, improving organization and consistency for test configurations.
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.

@rickeylev rickeylev added the do not merge Tag that prevents merging label Oct 2, 2025
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 correctly fixes an issue where musl and freethreaded toolchains were not being properly activated in WORKSPACE builds by ensuring target_settings are passed during toolchain registration. This change aligns the WORKSPACE behavior with the bzlmod implementation.

A significant portion of this PR involves refactoring the test infrastructure to centralize platform definitions, which greatly improves maintainability. Additionally, a comprehensive new test suite has been added to verify correct toolchain resolution across various configurations, which is an excellent addition to ensure the fix is robust.

I've found one critical issue in the new test implementation that would likely cause it to fail and have provided a suggestion for a fix. Overall, this is a high-quality contribution.

@rickeylev rickeylev force-pushed the fix.musl.ft.toolchain.registration.workspace branch from 4af90ca to bf68216 Compare October 2, 2025 17:10
@rickeylev rickeylev removed the do not merge Tag that prevents merging label Oct 2, 2025
@aignas aignas added this pull request to the merge queue Oct 3, 2025
Merged via the queue into bazel-contrib:main with commit 309e93e Oct 3, 2025
4 of 5 checks passed
@rickeylev rickeylev deleted the fix.musl.ft.toolchain.registration.workspace branch October 3, 2025 15:31
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.

--//python/config_settings:py_freethreaded flag doesn't affect selection of the toolchains if the downstream project uses WORKSPACE
2 participants