rustc: Move location of codegen-backends dir
#47893
Merged
Conversation
This file contains 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
|
(rust_highfive has picked a reviewer for you, use r? to override) |
Mark-Simulacrum
requested changes
Jan 31, 2018
src/bootstrap/compile.rs
Outdated
| let libdir = builder.sysroot_libdir(target_compiler, target); | ||
| let dst = libdir.join("codegen-backends"); | ||
| let dst = builder.sysroot_libdir(target_compiler, target) | ||
| .parent() |
There was a problem hiding this comment.
I believe we probably want to make this a dedicated function on builder. It seems like it's a relatively common thing to want (or at least that multiple places want it).
alexcrichton
force-pushed
the
move-codegen-backends
branch
from
096a67a to
751e07b
Compare
|
@bors: r=Mark-Simulacrum |
|
📌 Commit 751e07b has been approved by |
kennytm
added
the
S-waiting-on-bors
|
@bors r- On |
kennytm
added
S-waiting-on-author
alexcrichton
force-pushed
the
move-codegen-backends
branch
from
751e07b to
0e69f2d
Compare
|
@bors: r=Mark-Simulacrum |
|
📌 Commit 0e69f2d has been approved by |
kennytm
reviewed
Jan 31, 2018
src/bootstrap/builder.rs
Outdated
| self.sysroot_libdir(compiler, compiler.host) | ||
| .parent() | ||
| .unwrap() | ||
| .join("codegen-backends") |
There was a problem hiding this comment.
Nit pick: x.parent().unwrap().join("y") is the same as x.with_file_name("y") (unless x is root).
Right now this directory is located under: $sysroot/lib/rustlib/$target/lib/codegen-backends but after seeing what we do in a few other places it seems that a more appropriate location would be: $sysroot/lib/rustlib/$target/codegen-backends so this commit moves it!
alexcrichton
force-pushed
the
move-codegen-backends
branch
from
0e69f2d to
8ebe542
Compare
|
@bors: r=Mark-Simulacrum |
|
📌 Commit 8ebe542 has been approved by |
kennytm
added
S-waiting-on-bors
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Jan 31, 2018
… r=alexcrichton rustc: Move location of `codegen-backends` dir Right now this directory is located under: ``` $sysroot/lib/rustlib/$target/lib/codegen-backends ``` but after seeing what we do in a few other places it seems that a more appropriate location would be: ``` $sysroot/lib/rustlib/$target/codegen-backends ``` so this commit moves it!
bors
added a commit
that referenced
this pull request
Jan 31, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Right now this directory is located under:
but after seeing what we do in a few other places it seems that a more
appropriate location would be:
so this commit moves it!