]> git.lizzy.rs Git - rust.git/commit - src/tools/miri
Rollup merge of #74161 - tblah:riscv64gc-dockerfile-improvment, r=Mark-Simulacrum
authorManish Goregaokar <manishsmail@gmail.com>
Sat, 11 Jul 2020 06:26:54 +0000 (23:26 -0700)
committerGitHub <noreply@github.com>
Sat, 11 Jul 2020 06:26:54 +0000 (23:26 -0700)
commit8376fcd5ce17c9187a08f5bfef56ea36d2a54cf4
tree280dfb62877481b95b9c314cd12ad1e56c4cd784
parent8f2304f0c4fa7ffd5fa912e12c90403382c55d00
parentd9fec595e83423d7c35f0457a5c6a363fdaea02d
Rollup merge of #74161 - tblah:riscv64gc-dockerfile-improvment, r=Mark-Simulacrum

Fix  disabled dockerfiles

When the dockerfiles were moved into the host-x86_64 directory, paths
for COPY commands were updated with the new host-x86_64/ prefix. This
suggested that the intended context was src/ci/docker. However, the context
for disabled docker images was src/ci/docker/host-x86_64. This broke the new
paths and prevented src/ci/docker/scripts from being included in the
context at all.

This commit corrects this context allowing docker to find the files it
needs for COPY commands.

Also includes a quick fix to riscv recommended by @bjorn3