bootstrap: respect `build.python` on macOS #148636

xSetech · 2025-11-07T07:54:43Z

The python() method was hardcoded to return /usr/bin/python3 on macOS, ignoring the build.python config option. This change respects the config while maintaining the system Python as the default.

rustbot · 2025-11-07T08:24:31Z

r? @clubby789

rustbot has assigned @clubby789.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

xSetech · 2025-11-07T08:38:54Z

I've tested the default is set locally (x86_64-apple-darwin), but it'd be great if a CI job on an *-apple-darwin worker could also confirm.

src/bootstrap/src/lib.rs

jieyouxu · 2025-11-07T09:55:49Z

@bors try jobs=aarch64-apple

bootstrap: respect `build.python` on macOS try-job: aarch64-apple

src/bootstrap/src/lib.rs

rustbot · 2025-11-07T10:41:14Z

This PR modifies bootstrap.example.toml.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

jieyouxu

Thanks, @xSetech! I'll r+ once the try job comes back.

View changes since this review

rust-bors · 2025-11-07T11:30:42Z

💔 Test for 37f35bb failed: CI. Failed jobs:

try - aarch64-apple (web logs, extended logs)

jieyouxu · 2025-11-07T11:37:46Z

Curious, I'll take a look tmrw at how they are wired together 🤔

xSetech · 2025-11-07T20:37:09Z

sanity::check actually picks a Python interpreter before lib::python. It's complicated having more than one place where the interpreter is set, so I'll consolidate the logic that chooses a Python interpreter and refactor. That should fix the latest test result in #148646.

xSetech · 2025-11-07T22:48:57Z

The job tidy failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

Tidy CI job failures were widespread, see:
https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/CI.20keeps.20failing.20because.20of.20npm.20error/with/554424216

Zalathar · 2025-11-08T02:26:16Z

I wonder how viable it is to change debuginfo tests to use lldb's embedded Python (via the lldb script command), instead of having to coordinate an external Python version that happens to be compatible.

xSetech · 2025-11-08T20:16:23Z

I wonder how viable it is to change debuginfo tests to use lldb's embedded Python (via the lldb script command), instead of having to coordinate an external Python version that happens to be compatible.

To answer my own question, it seems very viable:

compiletest: Run the lldb_batchmode.py script in LLDB's embedded Python #148685

If we can consistently use LLDB's embedded Python, that should make build.python irrelevant to LLDB debuginfo tests.

@Zalathar The embedded interpreter seems like the best option for running the LLDB suite, agreed.

There are other components of the build that use Python, so unless there's an immediate proposal to remove build.python altogether, I think this PR and #148685 are complementary.

Zalathar · 2025-11-08T23:16:48Z

Right, we still want to respect build.python on macOS.

But the overlap is that if LLDB tests no longer use the configured/discovered Python, then (hopefully) there should be no need for special handling of Python on macOS at all. It might become possible for this PR to removes the special macOS handling, instead of modifying and moving it.

jieyouxu · 2025-11-09T11:11:35Z

I'm looking at the other PR first. If that seems to work, then we can land that and then have this PR remove the *-apple-darwin special case.
@rustbot blocked (#148685)

The `python()` method was hardcoded to return `/usr/bin/python3` on macOS, ignoring the `build.python` config option. This change respects the config and removes the macOS-specific default.

rustbot · 2025-11-10T21:28:22Z

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

xSetech · 2025-11-10T21:35:10Z

Rebased and removed both the special handling for macOS and related mentions of LLDB.

jieyouxu

Thanks

View changes since this review

jieyouxu · 2025-11-11T00:52:28Z

@bors r+

bors · 2025-11-11T00:52:31Z

📌 Commit 191a3e3 has been approved by jieyouxu

It is now in the queue for this repository.

jieyouxu · 2025-11-11T00:52:45Z

@bors rollup

…os, r=jieyouxu bootstrap: respect `build.python` on macOS The `python()` method was hardcoded to return `/usr/bin/python3` on macOS, ignoring the `build.python` config option. This change respects the config while maintaining the system Python as the default.

Rollup of 16 pull requests Successful merges: - #141470 (Add new `function_casts_as_integer` lint) - #143619 (`c_variadic`: Add future-incompatibility warning for `...` arguments without a pattern outside of `extern` blocks) - #146495 (rustdoc: Erase `#![doc(document_private_items)]`) - #147771 (Rename `*exact_{div,shr,shl}` to `*{div,shr,shl}_exact`) - #147833 (rustdoc-json: move `target` to `json::conversions`) - #147952 (Add a timeout to the `remote-test-client` connection) - #147955 (compiletest: Migrate `TestProps` directive handling to a system of named handlers) - #148480 (Add `Steal::risky_hack_borrow_mut`) - #148506 (Special case detecting `'static` lifetime requirement coming from `-> Box<dyn Trait>`) - #148508 (Provide more context when mutably borrowing an imutably borrowed value) - #148530 (update the bootstrap readme) - #148608 (Add test for --test-builder success path) - #148636 (bootstrap: respect `build.python` on macOS) - #148639 (test(rustdoc): move tests into jump-to-def) - #148647 (Check unsafety for non-macro attributes in `validate_attr`) - #148667 (a few small clippy fixes) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 15 pull requests Successful merges: - #141470 (Add new `function_casts_as_integer` lint) - #143619 (`c_variadic`: Add future-incompatibility warning for `...` arguments without a pattern outside of `extern` blocks) - #146495 (rustdoc: Erase `#![doc(document_private_items)]`) - #147771 (Rename `*exact_{div,shr,shl}` to `*{div,shr,shl}_exact`) - #147833 (rustdoc-json: move `target` to `json::conversions`) - #147955 (compiletest: Migrate `TestProps` directive handling to a system of named handlers) - #148480 (Add `Steal::risky_hack_borrow_mut`) - #148506 (Special case detecting `'static` lifetime requirement coming from `-> Box<dyn Trait>`) - #148508 (Provide more context when mutably borrowing an imutably borrowed value) - #148530 (update the bootstrap readme) - #148608 (Add test for --test-builder success path) - #148636 (bootstrap: respect `build.python` on macOS) - #148639 (test(rustdoc): move tests into jump-to-def) - #148647 (Check unsafety for non-macro attributes in `validate_attr`) - #148667 (a few small clippy fixes) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #148636 - xSetech:boostrap/set-python-on-macos, r=jieyouxu bootstrap: respect `build.python` on macOS The `python()` method was hardcoded to return `/usr/bin/python3` on macOS, ignoring the `build.python` config option. This change respects the config while maintaining the system Python as the default.

Rollup of 15 pull requests Successful merges: - rust-lang/rust#141470 (Add new `function_casts_as_integer` lint) - rust-lang/rust#143619 (`c_variadic`: Add future-incompatibility warning for `...` arguments without a pattern outside of `extern` blocks) - rust-lang/rust#146495 (rustdoc: Erase `#![doc(document_private_items)]`) - rust-lang/rust#147771 (Rename `*exact_{div,shr,shl}` to `*{div,shr,shl}_exact`) - rust-lang/rust#147833 (rustdoc-json: move `target` to `json::conversions`) - rust-lang/rust#147955 (compiletest: Migrate `TestProps` directive handling to a system of named handlers) - rust-lang/rust#148480 (Add `Steal::risky_hack_borrow_mut`) - rust-lang/rust#148506 (Special case detecting `'static` lifetime requirement coming from `-> Box<dyn Trait>`) - rust-lang/rust#148508 (Provide more context when mutably borrowing an imutably borrowed value) - rust-lang/rust#148530 (update the bootstrap readme) - rust-lang/rust#148608 (Add test for --test-builder success path) - rust-lang/rust#148636 (bootstrap: respect `build.python` on macOS) - rust-lang/rust#148639 (test(rustdoc): move tests into jump-to-def) - rust-lang/rust#148647 (Check unsafety for non-macro attributes in `validate_attr`) - rust-lang/rust#148667 (a few small clippy fixes) r? `@ghost` `@rustbot` modify labels: rollup

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Nov 7, 2025

xSetech marked this pull request as ready for review November 7, 2025 08:24

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 7, 2025

rustbot assigned clubby789 Nov 7, 2025

rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Nov 7, 2025

jieyouxu reviewed Nov 7, 2025

View reviewed changes

src/bootstrap/src/lib.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

rust-bors bot added a commit that referenced this pull request Nov 7, 2025

Auto merge of #148636 - xSetech:boostrap/set-python-on-macos, r=<try>

37f35bb

bootstrap: respect `build.python` on macOS try-job: aarch64-apple

hkBst reviewed Nov 7, 2025

View reviewed changes

src/bootstrap/src/lib.rs Outdated Show resolved Hide resolved

jieyouxu assigned jieyouxu and unassigned clubby789 Nov 7, 2025

jieyouxu approved these changes Nov 7, 2025

View reviewed changes

This comment has been minimized.

Sign in to view

jieyouxu mentioned this pull request Nov 7, 2025

compiletest: don't pickup a Python from PYTHONPATH in debuginfo #148646

Closed

This comment has been minimized.

Sign in to view

rustbot added the A-testsuite Area: The testsuite used to check the correctness of rustc label Nov 7, 2025

xSetech requested review from hkBst and jieyouxu November 7, 2025 21:10

This comment has been minimized.

Sign in to view

Zalathar mentioned this pull request Nov 8, 2025

compiletest: Run the lldb_batchmode.py script in LLDB's embedded Python #148685

Merged

rustbot added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 9, 2025

bootstrap: respect build.python on macOS

a726de2

The `python()` method was hardcoded to return `/usr/bin/python3` on macOS, ignoring the `build.python` config option. This change respects the config and removes the macOS-specific default.

xSetech force-pushed the boostrap/set-python-on-macos branch from 3904658 to a726de2 Compare November 10, 2025 21:28

Noted the previous forced default in the change tracker

191a3e3

jieyouxu added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Nov 11, 2025

jieyouxu approved these changes Nov 11, 2025

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 11, 2025

Zalathar mentioned this pull request Nov 11, 2025

Rollup of 17 pull requests #148810

Closed

Zalathar mentioned this pull request Nov 11, 2025

Rollup of 16 pull requests #148813

Closed

Zalathar mentioned this pull request Nov 11, 2025

Rollup of 15 pull requests #148817

Merged

bors merged commit e8404e4 into rust-lang:main Nov 11, 2025
11 checks passed

rustbot added this to the 1.93.0 milestone Nov 11, 2025

bootstrap: respect build.python on macOS #148636

bootstrap: respect build.python on macOS #148636

Conversation

xSetech commented Nov 7, 2025

Uh oh!

rustbot commented Nov 7, 2025

Uh oh!

xSetech commented Nov 7, 2025

Uh oh!

Uh oh!

jieyouxu commented Nov 7, 2025

Uh oh!

This comment has been minimized.

Uh oh!

rustbot commented Nov 7, 2025

Uh oh!

jieyouxu left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

This comment has been minimized.

rust-bors bot commented Nov 7, 2025

Uh oh!

jieyouxu commented Nov 7, 2025

Uh oh!

xSetech commented Nov 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

This comment has been minimized.

xSetech commented Nov 7, 2025

Uh oh!

Zalathar commented Nov 8, 2025

Uh oh!

xSetech commented Nov 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Zalathar commented Nov 8, 2025

Uh oh!

jieyouxu commented Nov 9, 2025

Uh oh!

rustbot commented Nov 10, 2025

Uh oh!

xSetech commented Nov 10, 2025

Uh oh!

jieyouxu left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jieyouxu commented Nov 11, 2025

Uh oh!

bors commented Nov 11, 2025

Uh oh!

jieyouxu commented Nov 11, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

bootstrap: respect `build.python` on macOS #148636

bootstrap: respect `build.python` on macOS #148636

jieyouxu left a comment •

edited by rustbot

Loading

xSetech commented Nov 7, 2025 •

edited

Loading

xSetech commented Nov 8, 2025 •

edited

Loading

jieyouxu left a comment •

edited by rustbot

Loading