Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
e02f133
move intrinsics codegen tests into a seperate folder
lcnr Jun 4, 2019
4c44d4a
improve test indentation
lcnr Jun 4, 2019
36601f6
Windows 10 SDK is also required now.
sfengyuan Jun 5, 2019
1cf662e
rephrase
sfengyuan Jun 7, 2019
3d6070d
Neutralize link
sfengyuan Jun 7, 2019
50e0c6c
Delete Rustbook step
Mark-Simulacrum Jun 7, 2019
e70e9c4
Delete unnecessary command
Mark-Simulacrum Jun 7, 2019
0e64a94
Inline prepare_tool_cmd
Mark-Simulacrum Jun 7, 2019
147246c
Make RemoteTestServer a bootstrap tool
Mark-Simulacrum Jun 7, 2019
b15cb0f
Delete unused fields on Crate struct
Mark-Simulacrum Jun 7, 2019
e4c44c7
Remove unnecessary Std dependency
Mark-Simulacrum Jun 7, 2019
41e976b
Azure: retry failed awscli installs
wesleywiser Jun 10, 2019
e3516a1
librustc_errors: Add some more documentation
phansch Jun 9, 2019
33137ff
Address review comments
phansch Jun 10, 2019
7b97cf9
make sure to_ascii_lowercase actually leaves upper-case non-ASCII cha…
RalfJung Jun 10, 2019
9ed4674
typeck: Fix const generic in repeat param ICE.
davidtwco Jun 9, 2019
d3461bf
core: use memcmp optimization for 128 bit integer slices
aschampion Jun 10, 2019
8eb7f36
std: Remove internal definitions of `cfg_if!` macro
alexcrichton Jun 10, 2019
97f4e70
syntax: Remove `SyntaxExtension::IdentTT` and `IdentMacroExpander`
petrochenkov Jun 6, 2019
5a6ebec
syntax: Remove `SyntaxExtension::MultiDecorator` and `MultiItemDecora…
petrochenkov Jun 6, 2019
edb925a
syntax: Use `MultiItemModifier` for built-in derives
petrochenkov Jun 6, 2019
8edbbac
syntax: Remove `SyntaxExtension::DeclMacro`
petrochenkov Jun 6, 2019
0468eb6
syntax: Improve documentation of `SyntaxExtension`
petrochenkov Jun 6, 2019
93eb63c
syntax: Rename variants of `SyntaxExtension` for consistency
petrochenkov Jun 6, 2019
c127f53
Use `for_each` in `Iterator::partition`
cuviper Jun 10, 2019
44033a7
Rollup merge of #61526 - lcnr:test_reorder, r=nikomatsakis
Centril Jun 11, 2019
c426fa5
Rollup merge of #61550 - jacobsun:patch-1, r=alexcrichton
Centril Jun 11, 2019
c6c9f66
Rollup merge of #61606 - petrochenkov:legclean, r=pnkfelix
Centril Jun 11, 2019
d3abd6c
Rollup merge of #61639 - Mark-Simulacrum:bootstrap-cleanup, r=alexcri…
Centril Jun 11, 2019
2c642de
Rollup merge of #61686 - phansch:librustc_errors_docs, r=estebank
Centril Jun 11, 2019
4f6aa0d
Rollup merge of #61698 - davidtwco:ice-const-generic-length, r=varkor
Centril Jun 11, 2019
a845141
Rollup merge of #61707 - wesleywiser:awscli_retry, r=alexcrichton
Centril Jun 11, 2019
503a790
Rollup merge of #61715 - RalfJung:test-ascii-lowercase, r=varkor
Centril Jun 11, 2019
5fa30ca
Rollup merge of #61720 - alexcrichton:libstd-cfg-if-dep, r=sfackler
Centril Jun 11, 2019
e294c42
Rollup merge of #61724 - aschampion:128-bit-memcmp, r=sfackler
Centril Jun 11, 2019
5837b9f
Rollup merge of #61726 - cuviper:partition-for_each, r=scottmcm
Centril Jun 11, 2019
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Delete unnecessary command
  • Loading branch information
Mark-Simulacrum committed Jun 8, 2019
commit e70e9c472079f6eaddb5c820b12d0b0e5408989c
10 changes: 3 additions & 7 deletions src/bootstrap/tool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -268,10 +268,6 @@ macro_rules! bootstrap_tool {
}

impl Tool {
pub fn get_mode(&self) -> Mode {
Mode::ToolBootstrap
}

/// Whether this tool requires LLVM to run
pub fn uses_llvm_tools(&self) -> bool {
match self {
Expand Down Expand Up @@ -659,23 +655,23 @@ impl<'a> Builder<'a> {
pub fn tool_cmd(&self, tool: Tool) -> Command {
let mut cmd = Command::new(self.tool_exe(tool));
let compiler = self.compiler(0, self.config.build);
self.prepare_tool_cmd(compiler, tool, &mut cmd);
self.prepare_tool_cmd(compiler, &mut cmd);
cmd
}

/// Prepares the `cmd` provided to be able to run the `compiler` provided.
///
/// Notably this munges the dynamic library lookup path to point to the
/// right location to run `compiler`.
fn prepare_tool_cmd(&self, compiler: Compiler, tool: Tool, cmd: &mut Command) {
fn prepare_tool_cmd(&self, compiler: Compiler, cmd: &mut Command) {
let host = &compiler.host;
let mut lib_paths: Vec<PathBuf> = vec![
if compiler.stage == 0 {
self.build.rustc_snapshot_libdir()
} else {
PathBuf::from(&self.sysroot_libdir(compiler, compiler.host))
},
self.cargo_out(compiler, tool.get_mode(), *host).join("deps"),
self.cargo_out(compiler, Mode::ToolBootstrap, *host).join("deps"),
];

// On MSVC a tool may invoke a C compiler (e.g., compiletest in run-make
Expand Down