Skip to content

/rust

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

Make Windows directory layout uniform with everything else #29500

Merged
merged 2 commits into from Nov 3, 2015

Conversation

Reviewers
No reviews
Assignees

@brson brson

Labels
None yet
Projects
None yet
Milestone
No milestone
6 participants
@vadimcn @nagisa @retep998 @alexcrichton @bors @brson
@vadimcn
Copy link
Contributor

vadimcn commented Nov 1, 2015

According to a recent discussion on IRC, there's no good reason for Windows builds to store target libraries under bin, when on every other platform they are under lib.

This might be a [breaking-change] for some users. I am pretty sure VisualRust has that path hard-coded somewhere.

r? @brson
@vadimcn
Windows: Move target libraries to $rustroot/lib/rustlib/... - for sym… 
…metry with all other platforms.
Loading status checks…
4e0c6db

@rust-highfive rust-highfive assigned brson Nov 1, 2015

@nagisa

This comment has been minimized.

Sign in to view
Copy link
Contributor

nagisa commented Nov 1, 2015

How does this interact with library search? In my memory libraries on windows would be put alongside the executable, so meddling with library search paths would be unnecessary.
@retep998

This comment has been minimized.

Sign in to view
Copy link
Member

retep998 commented Nov 1, 2015

@nagisa I believe this does not change the location of the DLLs for rustc itself, but rather changes the location of rustlib which is the target specific libraries.
@vadimcn

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

vadimcn commented Nov 1, 2015

Yah, dlls are still under bin
src/librustc/metadata/filesearch.rs Outdated
@@ -295,7 +294,7 @@ fn find_libdir(sysroot: &Path) -> String {

#[cfg(windows)]
fn find_libdir(_sysroot: &Path) -> String {
"bin".to_string()
"lib".to_string()

This comment has been minimized.

Sign in to view
Copy link
@alexcrichton

alexcrichton Nov 2, 2015

Member

I think with this change we could actually remove the #[cfg] from this function altogether perhaps?

This comment has been minimized.

Sign in to view
Copy link
@vadimcn

vadimcn Nov 2, 2015

Author Contributor

Do we need to do lib32/lib64 probing on Windows? I suppose there's no harm in that though...

This comment has been minimized.

Sign in to view
Copy link
@alexcrichton

alexcrichton Nov 2, 2015

Member

Nah not as far as I know at least, it'd basically just be a noop there
@alexcrichton

This comment has been minimized.

Sign in to view
Copy link
Member

alexcrichton commented Nov 2, 2015

r+ from me, thanks @vadimcn!
@vadimcn

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

vadimcn commented Nov 2, 2015

cc @vosen
@vadimcn

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

vadimcn commented Nov 2, 2015

@bors: r=alexcrichton 8cf50bc

bors added a commit that referenced this pull request Nov 3, 2015

@bors
Auto merge of #29500 - vadimcn:rustlib, r=alexcrichton 
According to a recent [discussion on IRC](https://botbot.me/mozilla/rust-tools/2015-10-27/?msg=52887517&page=2), there's no good reason for Windows builds to store target libraries under `bin`, when on every other platform they are under `lib`.

This might be a [breaking-change] for some users.  I am pretty sure VisualRust has that path hard-coded somewhere.

r? @brson
Loading status checks…
749625a
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Nov 3, 2015

⌛️ Testing commit 8cf50bc with merge 749625a...
@bors

@bors bors merged commit 8cf50bc into rust-lang:master Nov 3, 2015
2 checks passed

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details

arcnmx added a commit to arcnmx/rust that referenced this pull request Nov 4, 2015

@bors @arcnmx
Auto merge of rust-lang#29500 - vadimcn:rustlib, r=alexcrichton 
According to a recent [discussion on IRC](https://botbot.me/mozilla/rust-tools/2015-10-27/?msg=52887517&page=2), there's no good reason for Windows builds to store target libraries under `bin`, when on every other platform they are under `lib`.

This might be a [breaking-change] for some users.  I am pretty sure VisualRust has that path hard-coded somewhere.

r? @brson
c09f724
@brson

This comment has been minimized.

Sign in to view
Copy link
Contributor

brson commented Nov 4, 2015

I wish I had seen this before it landed. I do not fully understand the fallout offhand.
@brson

This comment has been minimized.

Sign in to view
Copy link
Contributor

brson commented Nov 4, 2015

My main concern was how this would affect rust-installer/rustup, but after a quick look I think they will not be impacted.

@vosen vosen referenced this pull request Jan 2, 2016

Merged

Handle MSVC ABI toolchain #199

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.