Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rust-lang/rust
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 08230775a
Choose a base ref
...
head repository: rust-lang/rust
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 60a0edc6c
Choose a head ref
36 contributors
Loading
Showing with 1,897 additions and 688 deletions.
  1. +6 −4 .travis.yml
  2. +6 −8 appveyor.yml
  3. +15 −3 src/bootstrap/bin/rustc.rs
  4. +25 −6 src/bootstrap/bootstrap.py
  5. +3 −0 src/bootstrap/flags.rs
  6. +4 −11 src/bootstrap/lib.rs
  7. +2 −0 src/bootstrap/mk/Makefile.in
  8. +3 −3 src/ci/docker/android/Dockerfile
  9. +3 −3 src/ci/docker/armhf-gnu/Dockerfile
  10. +3 −3 src/ci/docker/cross/Dockerfile
  11. +3 −3 src/ci/docker/dist-arm-linux/Dockerfile
  12. +3 −3 src/ci/docker/dist-armv7-aarch64-linux/Dockerfile
  13. +3 −3 src/ci/docker/dist-freebsd/Dockerfile
  14. +3 −3 src/ci/docker/dist-mips-linux/Dockerfile
  15. +3 −3 src/ci/docker/dist-mips64-linux/Dockerfile
  16. +3 −3 src/ci/docker/dist-powerpc-linux/Dockerfile
  17. +3 −3 src/ci/docker/dist-powerpc64-linux/Dockerfile
  18. +3 −3 src/ci/docker/dist-s390x-linux-netbsd/Dockerfile
  19. +3 −4 src/ci/docker/dist-x86-linux/Dockerfile
  20. +3 −3 src/ci/docker/emscripten/Dockerfile
  21. +3 −3 src/ci/docker/i686-gnu-nopt/Dockerfile
  22. +3 −3 src/ci/docker/i686-gnu/Dockerfile
  23. +11 −3 src/ci/docker/linux-tested-targets/Dockerfile
  24. +4 −1 src/ci/docker/linux-tested-targets/build-musl.sh
  25. +4 −2 src/ci/docker/run.sh
  26. +3 −3 src/ci/docker/x86_64-gnu-aux/Dockerfile
  27. +3 −3 src/ci/docker/x86_64-gnu-debug/Dockerfile
  28. +3 −3 src/ci/docker/x86_64-gnu-distcheck/Dockerfile
  29. +3 −3 src/ci/docker/x86_64-gnu-full-bootstrap/Dockerfile
  30. +3 −3 src/ci/docker/x86_64-gnu-incremental/Dockerfile
  31. +3 −3 src/ci/docker/x86_64-gnu-llvm-3.7/Dockerfile
  32. +3 −3 src/ci/docker/x86_64-gnu-nopt/Dockerfile
  33. +3 −3 src/ci/docker/x86_64-gnu/Dockerfile
  34. +7 −3 src/ci/run.sh
  35. +29 −0 src/ci/shared.sh
  36. +1 −1 src/doc/book/src/concurrency.md
  37. +74 −1 src/doc/book/src/procedural-macros.md
  38. +1 −1 src/doc/book/src/the-stack-and-the-heap.md
  39. +2 −2 src/doc/nomicon/src/exception-safety.md
  40. +20 −2 src/doc/nomicon/src/phantom-data.md
  41. +4 −21 src/libcollections/fmt.rs
  42. +45 −0 src/libcollections/string.rs
  43. +8 −0 src/libcollections/vec.rs
  44. +9 −1 src/libcompiler_builtins/build.rs
  45. +2 −0 src/libcore/slice.rs
  46. +14 −0 src/libcore/str/mod.rs
  47. +1 −1 src/liblibc
  48. +23 −13 src/librustc/cfg/construct.rs
  49. +3 −2 src/librustc/hir/def.rs
  50. +14 −10 src/librustc/hir/intravisit.rs
  51. +134 −38 src/librustc/hir/lowering.rs
  52. +51 −7 src/librustc/hir/mod.rs
  53. +6 −6 src/librustc/hir/print.rs
  54. +27 −26 src/librustc/infer/error_reporting.rs
  55. +1 −0 src/librustc/middle/expr_use_visitor.rs
  56. +18 −27 src/librustc/middle/liveness.rs
  57. +1 −0 src/librustc/middle/mem_categorization.rs
  58. +3 −0 src/librustc/mir/mod.rs
  59. +41 −32 src/librustc/session/config.rs
  60. +5 −0 src/librustc/session/mod.rs
  61. +4 −0 src/librustc/ty/adjustment.rs
  62. +1 −1 src/librustc/ty/inhabitedness/mod.rs
  63. +1 −0 src/librustc_back/target/mod.rs
  64. +35 −0 src/librustc_back/target/sparcv9_sun_solaris.rs
  65. +62 −30 src/librustc_const_eval/_match.rs
  66. +34 −0 src/librustc_const_eval/check_match.rs
  67. +5 −4 src/librustc_incremental/calculate_svh/svh_visitor.rs
  68. +5 −0 src/librustc_incremental/persist/data.rs
  69. +12 −0 src/librustc_incremental/persist/load.rs
  70. +19 −2 src/librustc_incremental/persist/preds/mod.rs
  71. +6 −1 src/librustc_incremental/persist/save.rs
  72. +12 −2 src/librustc_metadata/creader.rs
  73. +15 −6 src/librustc_metadata/decoder.rs
  74. +1 −0 src/librustc_mir/build/expr/as_lvalue.rs
  75. +4 −0 src/librustc_mir/build/expr/as_rvalue.rs
  76. +1 −0 src/librustc_mir/build/expr/category.rs
  77. +1 −0 src/librustc_mir/build/expr/into.rs
  78. +7 −15 src/librustc_mir/build/scope.rs
  79. +21 −5 src/librustc_mir/hair/cx/expr.rs
  80. +2 −7 src/librustc_mir/hair/cx/mod.rs
  81. +5 −2 src/librustc_mir/hair/mod.rs
  82. +1 −0 src/librustc_mir/transform/qualify_consts.rs
  83. +1 −0 src/librustc_passes/consts.rs
  84. +16 −0 src/librustc_passes/diagnostics.rs
  85. +33 −16 src/librustc_passes/loops.rs
  86. +6 −18 src/librustc_passes/static_recursion.rs
  87. +1 −2 src/librustc_resolve/build_reduced_graph.rs
  88. +25 −16 src/librustc_resolve/lib.rs
  89. +37 −23 src/librustc_resolve/macros.rs
  90. +1 −1 src/librustc_save_analysis/dump_visitor.rs
  91. +4 −0 src/librustc_trans/abi.rs
  92. +10 −7 src/librustc_trans/base.rs
  93. +8 −1 src/librustc_trans/builder.rs
  94. +25 −7 src/librustc_trans/collector.rs
  95. +9 −1 src/librustc_trans/glue.rs
  96. +5 −3 src/librustc_trans/meth.rs
  97. +22 −1 src/librustc_trans/mir/constant.rs
  98. +23 −0 src/librustc_trans/mir/rvalue.rs
  99. +64 −1 src/librustc_typeck/check/coercion.rs
  100. +8 −11 src/librustc_typeck/check/mod.rs
  101. +4 −0 src/librustc_typeck/check/writeback.rs
  102. +10 −2 src/librustdoc/test.rs
  103. +1 −1 src/librustdoc/visit_ast.rs
  104. +4 −0 src/libstd/build.rs
  105. +11 −23 src/libstd/collections/hash/map.rs
  106. +1 −1 src/libstd/panic.rs
  107. +69 −7 src/libstd/sync/barrier.rs
  108. +3 −1 src/libstd/sync/mutex.rs
  109. +1 −1 src/libstd/sys/redox/mod.rs
  110. +4 −0 src/libstd/sys/redox/net/tcp.rs
  111. +8 −0 src/libstd/sys/redox/net/udp.rs
  112. +14 −13 src/libstd/sys/unix/fs.rs
  113. +1 −1 src/libstd/sys/unix/os.rs
  114. +1 −1 src/libstd/sys/unix/process/magenta.rs
  115. +2 −2 src/libstd/sys/unix/process/process_fuchsia.rs
  116. +6 −3 src/libstd/thread/mod.rs
  117. +1 −1 src/libsyntax/ext/base.rs
  118. +9 −3 src/libsyntax/feature_gate.rs
  119. +3 −3 src/libtest/lib.rs
  120. 0 { → src/test}/COMPILER_TESTS.md
  121. +2 −2 src/test/codegen/function-arguments.rs
  122. +26 −3 src/test/compile-fail-fulldeps/proc-macro/resolve-error.rs
  123. +1 −0 src/test/compile-fail/asm-bad-clobber.rs
  124. +1 −0 src/test/compile-fail/asm-in-bad-modifier.rs
  125. +1 −0 src/test/compile-fail/asm-misplaced-option.rs
  126. +1 −0 src/test/compile-fail/asm-out-assign-imm.rs
  127. +1 −0 src/test/compile-fail/asm-out-no-modifier.rs
  128. +1 −0 src/test/compile-fail/asm-out-read-uninit.rs
  129. +24 −0 src/test/compile-fail/closure-no-fn.rs
  130. +0 −2 src/test/compile-fail/default_ty_param_conflict.rs
  131. +0 −2 src/test/compile-fail/default_ty_param_conflict_cross_crate.rs
  132. +45 −0 src/test/compile-fail/feature-gate-closure_to_fn_coercion.rs
  133. +0 −49 src/test/compile-fail/feature-gate-static_recursion.rs
  134. +0 −2 src/test/compile-fail/issue-3008-2.rs
  135. +4 −0 src/test/compile-fail/issue-35869.rs
  136. +2 −2 src/test/compile-fail/issue-37131.rs
  137. +55 −0 src/test/compile-fail/issue-37576.rs
  138. +30 −0 src/test/compile-fail/match-privately-empty.rs
  139. +1 −2 src/test/compile-fail/resolve-label.rs
  140. +3 −7 src/test/compile-fail/uninhabited-matches-feature-gated.rs
  141. +18 −0 src/test/incremental/issue-39828/auxiliary/generic.rs
  142. +22 −0 src/test/incremental/issue-39828/issue-39828.rs
  143. +2 −0 src/test/parse-fail/range_inclusive_gate.rs
  144. +8 −8 src/test/run-make/graphviz-flowgraph/f10.dot-expected.dot
  145. +24 −24 src/test/run-make/graphviz-flowgraph/f23.dot-expected.dot
  146. +5 −6 src/test/{compile-fail/static-recursion-gate.rs → run-pass/auxiliary/clibrary.rs}
  147. +17 −0 src/test/run-pass/auxiliary/issue_39823.rs
  148. +41 −0 src/test/run-pass/closure-to-fn-coercion.rs
  149. +0 −2 src/test/run-pass/issue-2063-resource.rs
  150. +0 −2 src/test/run-pass/issue-2063.rs
  151. +25 −0 src/test/run-pass/issue-38972.rs
  152. +34 −0 src/test/run-pass/issue-39823.rs
  153. +35 −0 src/test/run-pass/iter-sum-overflow-overflow-checks.rs
  154. +23 −0 src/test/run-pass/lib-defaults.rs
  155. +9 −1 src/test/run-pass/loop-break-value.rs
  156. +4 −1 src/test/run-pass/panic-safe.rs
  157. +0 −2 src/test/run-pass/static-recursive.rs
  158. +3 −0 src/test/ui/mismatched_types/E0053.stderr
  159. +3 −0 src/test/ui/mismatched_types/trait-impl-fn-incompatibility.stderr
  160. +11 −17 src/tools/build-manifest/src/main.rs
  161. +14 −3 src/tools/compiletest/src/runtest.rs
  162. +3 −3 src/tools/tidy/src/features.rs
10 changes: 6 additions & 4 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -45,8 +45,8 @@ matrix:
os: osx
osx_image: xcode8.2
install: &osx_install_sccache >
curl -L https://api.pub.build.mozilla.org/tooltool/sha512/d0025b286468cc5ada83b23d3fafbc936b9f190eaa7d4a981715b18e8e3bf720a7bcee7bfe758cfdeb8268857f6098fd52dcdd8818232692a30ce91039936596 |
tar xJf - -C /usr/local/bin --strip-components=1
travis_retry curl -o /usr/local/bin/sccache https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-apple-darwin &&
chmod +x /usr/local/bin/sccache
- env: >
RUST_CHECK_TARGET=check
RUST_CONFIGURE_ARGS=--build=i686-apple-darwin
@@ -63,8 +63,10 @@ matrix:
os: osx
osx_image: xcode8.2
install: >
curl -L https://api.pub.build.mozilla.org/tooltool/sha512/d0025b286468cc5ada83b23d3fafbc936b9f190eaa7d4a981715b18e8e3bf720a7bcee7bfe758cfdeb8268857f6098fd52dcdd8818232692a30ce91039936596 |
tar xJf - -C /usr/local/bin --strip-components=1 && brew uninstall --ignore-dependencies openssl && brew install openssl --universal --without-test
travis_retry curl -o /usr/local/bin/sccache https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-apple-darwin &&
chmod +x /usr/local/bin/sccache &&
brew uninstall --ignore-dependencies openssl &&
brew install openssl --universal --without-test
- env: >
RUST_CHECK_TARGET=dist
RUST_CONFIGURE_ARGS="--target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-extended"
14 changes: 6 additions & 8 deletions appveyor.yml
View file
Original file line number Diff line number Diff line change
@@ -103,7 +103,7 @@ install:
# /usr/bin/python2.7.exe is not. To ensure we use the right interpreter we
# move `C:\Python27` ahead in PATH and then also make sure the `python2.7.exe`
# file exists in there (which it doesn't by default).
- if defined MINGW_URL appveyor DownloadFile %MINGW_URL%/%MINGW_ARCHIVE%
- if defined MINGW_URL appveyor-retry appveyor DownloadFile %MINGW_URL%/%MINGW_ARCHIVE%
- if defined MINGW_URL 7z x -y %MINGW_ARCHIVE% > nul
- if defined MINGW_URL set PATH=%CD%\%MINGW_DIR%\bin;C:\msys64\usr\bin;%PATH%

@@ -115,14 +115,12 @@ install:
- set PATH=C:\Python27;%PATH%

# Download and install sccache
- appveyor DownloadFile https://api.pub.build.mozilla.org/tooltool/sha512/%SCCACHE_DIGEST%
- mv %SCCACHE_DIGEST% sccache.tar.bz2
- 7z x -y sccache.tar.bz2 > nul
- 7z x -y sccache.tar > nul
- set PATH=%PATH%;%CD%\sccache2
- appveyor-retry appveyor DownloadFile https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-pc-windows-msvc
- mv 2017-02-24-sccache-x86_64-pc-windows-msvc sccache
- set PATH=%PATH%;%CD%

# Install InnoSetup to get `iscc` used to produce installers
- choco install -y InnoSetup
- appveyor-retry choco install -y InnoSetup
- set PATH="C:\Program Files (x86)\Inno Setup 5";%PATH%

# Help debug some handle issues on AppVeyor
@@ -133,7 +131,7 @@ install:
- handle.exe -accepteula -help

test_script:
- git submodule update --init
- appveyor-retry sh -c 'git submodule deinit -f . && git submodule update --init'
- set SRC=.
- set NO_CCACHE=1
- sh src/ci/run.sh
18 changes: 15 additions & 3 deletions src/bootstrap/bin/rustc.rs
View file
Original file line number Diff line number Diff line change
@@ -68,6 +68,7 @@ fn main() {
};
let stage = env::var("RUSTC_STAGE").expect("RUSTC_STAGE was not set");
let sysroot = env::var_os("RUSTC_SYSROOT").expect("RUSTC_SYSROOT was not set");
let mut on_fail = env::var_os("RUSTC_ON_FAIL").map(|of| Command::new(of));

let rustc = env::var_os(rustc).unwrap_or_else(|| panic!("{:?} was not set", rustc));
let libdir = env::var_os(libdir).unwrap_or_else(|| panic!("{:?} was not set", libdir));
@@ -217,9 +218,20 @@ fn main() {
}

// Actually run the compiler!
std::process::exit(match exec_cmd(&mut cmd) {
Ok(s) => s.code().unwrap_or(0xfe),
Err(e) => panic!("\n\nfailed to run {:?}: {}\n\n", cmd, e),
std::process::exit(if let Some(ref mut on_fail) = on_fail {
match cmd.status() {
Ok(s) if s.success() => 0,
_ => {
println!("\nDid not run successfully:\n{:?}\n-------------", cmd);
exec_cmd(on_fail).expect("could not run the backup command");
1
}
}
} else {
std::process::exit(match exec_cmd(&mut cmd) {
Ok(s) => s.code().unwrap_or(0xfe),
Err(e) => panic!("\n\nfailed to run {:?}: {}\n\n", cmd, e),
})
})
}

31 changes: 25 additions & 6 deletions src/bootstrap/bootstrap.py
View file
Original file line number Diff line number Diff line change
@@ -59,20 +59,33 @@ def delete_if_present(path, verbose):


def download(path, url, probably_big, verbose):
for x in range(0, 4):
try:
_download(path, url, probably_big, verbose, True)
return
except RuntimeError:
print("\nspurious failure, trying again")
_download(path, url, probably_big, verbose, False)


def _download(path, url, probably_big, verbose, exception):
if probably_big or verbose:
print("downloading {}".format(url))
# see http://serverfault.com/questions/301128/how-to-download
if sys.platform == 'win32':
run(["PowerShell.exe", "/nologo", "-Command",
"(New-Object System.Net.WebClient)"
".DownloadFile('{}', '{}')".format(url, path)],
verbose=verbose)
verbose=verbose,
exception=exception)
else:
if probably_big or verbose:
option = "-#"
else:
option = "-s"
run(["curl", option, "--retry", "3", "-Sf", "-o", path, url], verbose=verbose)
run(["curl", option, "--retry", "3", "-Sf", "-o", path, url],
verbose=verbose,
exception=exception)


def verify(path, sha_path, verbose):
@@ -112,7 +125,7 @@ def unpack(tarball, dst, verbose=False, match=None):
shutil.move(tp, fp)
shutil.rmtree(os.path.join(dst, fname))

def run(args, verbose=False):
def run(args, verbose=False, exception=False):
if verbose:
print("running: " + ' '.join(args))
sys.stdout.flush()
@@ -122,7 +135,7 @@ def run(args, verbose=False):
code = ret.wait()
if code != 0:
err = "failed to run: " + ' '.join(args)
if verbose:
if verbose or exception:
raise RuntimeError(err)
sys.exit(err)

@@ -342,8 +355,12 @@ def build_bootstrap(self):
env = os.environ.copy()
env["CARGO_TARGET_DIR"] = build_dir
env["RUSTC"] = self.rustc()
env["LD_LIBRARY_PATH"] = os.path.join(self.bin_root(), "lib")
env["DYLD_LIBRARY_PATH"] = os.path.join(self.bin_root(), "lib")
env["LD_LIBRARY_PATH"] = os.path.join(self.bin_root(), "lib") + \
(os.pathsep + env["LD_LIBRARY_PATH"]) \
if "LD_LIBRARY_PATH" in env else ""
env["DYLD_LIBRARY_PATH"] = os.path.join(self.bin_root(), "lib") + \
(os.pathsep + env["DYLD_LIBRARY_PATH"]) \
if "DYLD_LIBRARY_PATH" in env else ""
env["PATH"] = os.path.join(self.bin_root(), "bin") + \
os.pathsep + env["PATH"]
if not os.path.isfile(self.cargo()):
@@ -472,6 +489,8 @@ def build_triple(self):
ostype += 'abi64'
elif cputype in {'powerpc', 'ppc', 'ppc64'}:
cputype = 'powerpc'
elif cputype == 'sparcv9':
pass
elif cputype in {'amd64', 'x86_64', 'x86-64', 'x64'}:
cputype = 'x86_64'
else:
3 changes: 3 additions & 0 deletions src/bootstrap/flags.rs
View file
Original file line number Diff line number Diff line change
@@ -28,6 +28,7 @@ use step;
/// Deserialized version of all flags for this compile.
pub struct Flags {
pub verbose: usize, // verbosity level: 0 == not verbose, 1 == verbose, 2 == very verbose
pub on_fail: Option<String>,
pub stage: Option<u32>,
pub keep_stage: Option<u32>,
pub build: String,
@@ -81,6 +82,7 @@ impl Flags {
opts.optopt("", "build", "build target of the stage0 compiler", "BUILD");
opts.optmulti("", "host", "host targets to build", "HOST");
opts.optmulti("", "target", "target targets to build", "TARGET");
opts.optopt("", "on-fail", "command to run on failure", "CMD");
opts.optopt("", "stage", "stage to build", "N");
opts.optopt("", "keep-stage", "stage to keep without recompiling", "N");
opts.optopt("", "src", "path to the root of the rust checkout", "DIR");
@@ -283,6 +285,7 @@ To learn more about a subcommand, run `./x.py <command> -h`
Flags {
verbose: m.opt_count("v"),
stage: stage,
on_fail: m.opt_str("on-fail"),
keep_stage: m.opt_str("keep-stage").map(|j| j.parse().unwrap()),
build: m.opt_str("build").unwrap_or_else(|| {
env::var("BUILD").unwrap()
15 changes: 4 additions & 11 deletions src/bootstrap/lib.rs
View file
Original file line number Diff line number Diff line change
@@ -499,6 +499,10 @@ impl Build {
cargo.env("RUSTC_INCREMENTAL", incr_dir);
}

if let Some(ref on_fail) = self.flags.on_fail {
cargo.env("RUSTC_ON_FAIL", on_fail);
}

let verbose = cmp::max(self.config.verbose, self.flags.verbose);
cargo.env("RUSTC_VERBOSE", format!("{}", verbose));

@@ -828,17 +832,6 @@ impl Build {
if target.contains("apple-darwin") {
base.push("-stdlib=libc++".into());
}
// This is a hack, because newer binutils broke things on some vms/distros
// (i.e., linking against unknown relocs disabled by the following flag)
// See: https://github.com/rust-lang/rust/issues/34978
match target {
"i586-unknown-linux-gnu" |
"i686-unknown-linux-musl" |
"x86_64-unknown-linux-musl" => {
base.push("-Wa,-mrelax-relocations=no".into());
},
_ => {},
}
return base
}

2 changes: 2 additions & 0 deletions src/bootstrap/mk/Makefile.in
View file
Original file line number Diff line number Diff line change
@@ -71,6 +71,8 @@ install:
$(Q)$(BOOTSTRAP) dist --install $(BOOTSTRAP_ARGS)
tidy:
$(Q)$(BOOTSTRAP) test src/tools/tidy $(BOOTSTRAP_ARGS)
prepare:
$(Q)$(BOOTSTRAP) build nonexistent/path/to/trigger/cargo/metadata

check-stage2-T-arm-linux-androideabi-H-x86_64-unknown-linux-gnu:
$(Q)$(BOOTSTRAP) test --target arm-linux-androideabi
6 changes: 3 additions & 3 deletions src/ci/docker/android/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -35,9 +35,9 @@ COPY start-emulator.sh /android/

ENTRYPOINT ["/usr/bin/dumb-init", "--", "/android/start-emulator.sh"]

ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
tar xJf - -C /usr/local/bin --strip-components=1
RUN curl -o /usr/local/bin/sccache \
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
chmod +x /usr/local/bin/sccache

ENV TARGETS=arm-linux-androideabi
ENV TARGETS=$TARGETS,i686-linux-android
6 changes: 3 additions & 3 deletions src/ci/docker/armhf-gnu/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -73,9 +73,9 @@ RUN arm-linux-gnueabihf-gcc addentropy.c -o rootfs/addentropy -static
# TODO: What is this?!
RUN curl -O http://ftp.nl.debian.org/debian/dists/jessie/main/installer-armhf/current/images/device-tree/vexpress-v2p-ca15-tc1.dtb

ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
tar xJf - -C /usr/local/bin --strip-components=1
RUN curl -o /usr/local/bin/sccache \
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
chmod +x /usr/local/bin/sccache

RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
dpkg -i dumb-init_*.deb && \
6 changes: 3 additions & 3 deletions src/ci/docker/cross/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -21,9 +21,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libssl-dev \
pkg-config

ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
tar xJf - -C /usr/local/bin --strip-components=1
RUN curl -o /usr/local/bin/sccache \
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
chmod +x /usr/local/bin/sccache

RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
dpkg -i dumb-init_*.deb && \
6 changes: 3 additions & 3 deletions src/ci/docker/dist-arm-linux/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -27,9 +27,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libssl-dev \
pkg-config

ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
tar xJf - -C /usr/local/bin --strip-components=1
RUN curl -o /usr/local/bin/sccache \
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
chmod +x /usr/local/bin/sccache

RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
dpkg -i dumb-init_*.deb && \
6 changes: 3 additions & 3 deletions src/ci/docker/dist-armv7-aarch64-linux/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -27,9 +27,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libssl-dev \
pkg-config

ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
tar xJf - -C /usr/local/bin --strip-components=1
RUN curl -o /usr/local/bin/sccache \
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
chmod +x /usr/local/bin/sccache

RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
dpkg -i dumb-init_*.deb && \
6 changes: 3 additions & 3 deletions src/ci/docker/dist-freebsd/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -25,9 +25,9 @@ RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-ini
rm dumb-init_*.deb
ENTRYPOINT ["/usr/bin/dumb-init", "--"]

ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
tar xJf - -C /usr/local/bin --strip-components=1
RUN curl -o /usr/local/bin/sccache \
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
chmod +x /usr/local/bin/sccache

ENV \
AR_x86_64_unknown_freebsd=x86_64-unknown-freebsd10-ar \
6 changes: 3 additions & 3 deletions src/ci/docker/dist-mips-linux/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -17,9 +17,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libssl-dev \
pkg-config

ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
tar xJf - -C /usr/local/bin --strip-components=1
RUN curl -o /usr/local/bin/sccache \
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
chmod +x /usr/local/bin/sccache

RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
dpkg -i dumb-init_*.deb && \
6 changes: 3 additions & 3 deletions src/ci/docker/dist-mips64-linux/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -17,9 +17,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libssl-dev \
pkg-config

ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
tar xJf - -C /usr/local/bin --strip-components=1
RUN curl -o /usr/local/bin/sccache \
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
chmod +x /usr/local/bin/sccache

RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
dpkg -i dumb-init_*.deb && \
6 changes: 3 additions & 3 deletions src/ci/docker/dist-powerpc-linux/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -27,9 +27,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libssl-dev \
pkg-config

ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
tar xJf - -C /usr/local/bin --strip-components=1
RUN curl -o /usr/local/bin/sccache \
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
chmod +x /usr/local/bin/sccache

RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
dpkg -i dumb-init_*.deb && \
6 changes: 3 additions & 3 deletions src/ci/docker/dist-powerpc64-linux/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -27,9 +27,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libssl-dev \
pkg-config

ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
tar xJf - -C /usr/local/bin --strip-components=1
RUN curl -o /usr/local/bin/sccache \
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
chmod +x /usr/local/bin/sccache

RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
dpkg -i dumb-init_*.deb && \
6 changes: 3 additions & 3 deletions src/ci/docker/dist-s390x-linux-netbsd/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -27,9 +27,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libssl-dev \
pkg-config

ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
tar xJf - -C /usr/local/bin --strip-components=1
RUN curl -o /usr/local/bin/sccache \
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
chmod +x /usr/local/bin/sccache

RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
dpkg -i dumb-init_*.deb && \
7 changes: 3 additions & 4 deletions src/ci/docker/dist-x86-linux/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -74,10 +74,9 @@ RUN curl -Lo /rustroot/dumb-init \
chmod +x /rustroot/dumb-init
ENTRYPOINT ["/rustroot/dumb-init", "--"]

ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
xz --decompress | \
tar xf - -C /usr/local/bin --strip-components=1
RUN curl -o /usr/local/bin/sccache \
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
chmod +x /usr/local/bin/sccache

ENV HOSTS=i686-unknown-linux-gnu
ENV HOSTS=$HOSTS,x86_64-unknown-linux-gnu
Loading