Skip to content

Two Windows fixes #16691

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 2 commits into from
Aug 24, 2014
Merged

Two Windows fixes #16691

merged 2 commits into from
Aug 24, 2014

Conversation

klutzy
Copy link
Contributor

@klutzy klutzy commented Aug 23, 2014

First commit fixes issue regarding recognizing MSYS2 build.
Second commit fixes issue regarding MSYS/Windows paths.

klutzy added 2 commits August 23, 2014 01:47
When MSYS shell executes program, if its arguments look like MSYS paths,
MSYS automatically converts them into Windows paths.
For example, `/c/path:/d/path` becomes `C:\path;D:\path`.
However, if there is only one path e.g. `/c/path`, it becomes `C:/path`.

maketest.py reverts the behavior to reduce confusion between MSYS and
Windows, but it didn't handle the `/c/path` case. This patch fixes the
issue.

Fixes rust-lang#15297
Fixes rust-lang#15250
@alexcrichton
Copy link
Member

Does this mean that users of mingw-w64 will get a 64-bit build by default? We don't currently have automation set up just yet (coming soon!), so I just want to clarify.

@thestinger
Copy link
Contributor

I think it will depend on whether you start msys2 with the mingw32 shell or the mingw64 shell. I'm not sure about non-msys2 environments, but msys2 is the sanest way to use Rust on Windows.

@klutzy
Copy link
Contributor Author

klutzy commented Aug 23, 2014

@alexcrichton mingw-w64/32-bit user will get 32-bit build.
Currently, on msys2 + mingw-w32/32-bit, configure wrongly guesses CFG_OSTYPE so it tries to build x86_64-pc-mingw32 even if 32-bit system is prepared. Thus extra flag (--build=i686-pc-mingw32) is needed. The first commit fixes the issue.

bors added a commit that referenced this pull request Aug 23, 2014
First commit fixes issue regarding recognizing MSYS2 build.
Second commit fixes issue regarding MSYS/Windows paths.
@bors bors closed this Aug 24, 2014
@bors bors merged commit 7eb35bc into rust-lang:master Aug 24, 2014
@klutzy klutzy deleted the issue-15297 branch October 10, 2019 20:38
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 3, 2024
…Veykril

fix: Fix completions panicking with certain macro setups

Unable to figure out a test case for this but managed to run into it in r-a reproducably.

Fixes rust-lang/rust-analyzer#16266 Fixes rust-lang/rust-analyzer#13255
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.

4 participants