make shared_helpers exe function work for both cygwin and non-cygwin hosts#141374
Merged
bors merged 1 commit intorust-lang:masterfrom May 23, 2025
jeremyd2019:patch-1
Merged
make shared_helpers exe function work for both cygwin and non-cygwin hosts#141374bors merged 1 commit intorust-lang:masterfrom jeremyd2019:patch-1
bors merged 1 commit intorust-lang:masterfrom
jeremyd2019:patch-1
Conversation
Collaborator
|
r? @onur-ozkan rustbot has assigned @onur-ozkan. Use |
rustbot
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
Contributor
|
Thank you! Could you please squash your commits into single commit? I am also not familiar with the Windows environment, so passing this to person that I kind a know that they are using Windows. r? @jieyouxu |
Contributor
Author
|
sure, that was the point of the |
mati865
approved these changes
May 22, 2025
Member
mati865
left a comment
mati865
left a comment
There was a problem hiding this comment.
How about leaving a comment there? I feel like this condition will not be obvious, even to people familiar with Cygwin.
Member
|
Yeah, please leave a comment. When I reviewed the original PR the change looked correct. |
Member
|
@rustbot author |
rustbot
removed
the
S-waiting-on-review
Collaborator
|
Reminder, once the PR becomes ready for a review, use |
rustbot
added
the
S-waiting-on-author
…hosts On Cygwin, it needs to not append .exe, because /proc/self/exe (and therefore std::env::current_exe) does not include the .exe extension, breaking bootstrap's rustc wrapper. On hosts other than Cygwin, it *does* need to append .exe because the file really does have a .exe extension, and non-Cygwin hosts won't be doing the same filename rewriting that Cygwin does when looking for a file X but finding only X.exe in its place.
Contributor
Author
|
@rustbot ready |
rustbot
added
S-waiting-on-review
Member
|
@bors r+ rollup |
Collaborator
Collaborator
|
🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened. |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
May 23, 2025
make shared_helpers exe function work for both cygwin and non-cygwin hosts On Cygwin, it needs to not append .exe, because /proc/self/exe (and therefore `std::env::current_exe`) does not include the .exe extension, breaking bootstrap's rustc wrapper. On hosts other than Cygwin, it *does* need to append .exe because the file really does have a .exe extension, and non-Cygwin hosts won't be doing the same filename rewriting that Cygwin does when looking for a file X but finding only X.exe in its place. Arising from discussion in rust-lang#140154 (review) `@mati865` `@Berrysoft`
This was referenced May 23, 2025
bors
added a commit
that referenced
this pull request
May 23, 2025
Rollup of 7 pull requests Successful merges: - #138896 (std: fix aliasing bug in UNIX process implementation) - #140832 (aarch64-linux: Default to FramePointer::NonLeaf) - #141065 (Updated std doctests for wasm) - #141369 (Simplify `format_integer_with_underscore_sep`) - #141374 (make shared_helpers exe function work for both cygwin and non-cygwin hosts) - #141398 (chore: fix typos in comment) - #141457 (Update mdbook to 0.4.50) Failed merges: - #141405 (GetUserProfileDirectoryW is now documented to always store the size) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
May 23, 2025
Rollup merge of #141374 - jeremyd2019:patch-1, r=jieyouxu make shared_helpers exe function work for both cygwin and non-cygwin hosts On Cygwin, it needs to not append .exe, because /proc/self/exe (and therefore `std::env::current_exe`) does not include the .exe extension, breaking bootstrap's rustc wrapper. On hosts other than Cygwin, it *does* need to append .exe because the file really does have a .exe extension, and non-Cygwin hosts won't be doing the same filename rewriting that Cygwin does when looking for a file X but finding only X.exe in its place. Arising from discussion in #140154 (review) ``@mati865`` ``@Berrysoft``
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
On Cygwin, it needs to not append .exe, because /proc/self/exe (and therefore
std::env::current_exe) does not include the .exe extension, breaking bootstrap's rustc wrapper. On hosts other than Cygwin, it does need to append .exe because the file really does have a .exe extension, and non-Cygwin hosts won't be doing the same filename rewriting that Cygwin does when looking for a file X but finding only X.exe in its place.Arising from discussion in #140154 (review)
@mati865 @Berrysoft