Skip to content

Commit 353e06b

Browse files
committed
hack powerpc64, solaris and pc-windows-gnu and sparc64
1 parent 8f22bbf commit 353e06b

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

Dockerfile.hack

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ARG CROSS_IMAGE
2+
FROM $CROSS_IMAGE

xtask/src/build_docker_image.rs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,17 @@ fn locate_dockerfile(
8484
} else {
8585
eyre::bail!("unable to find dockerfile for target \"{target}\"");
8686
};
87-
let dockerfile = dockerfile_root.join(dockerfile_name).to_utf8()?.to_string();
87+
let dockerfile = if matches!(
88+
target.triplet.as_str(),
89+
"powerpc64-unknown-linux-gnu" | "x86_64-sun-solaris" | "i686-pc-windows-gnu" | "x86_64-pc-windows-gnu" | "sparc64-unknown-linux-gnu"
90+
) {
91+
crate::util::project_dir(&mut <_>::default())?
92+
.join("Dockerfile.hack")
93+
.to_utf8()?
94+
.to_string()
95+
} else {
96+
dockerfile_root.join(dockerfile_name).to_utf8()?.to_string()
97+
};
8898
Ok((target, dockerfile))
8999
}
90100

@@ -243,6 +253,8 @@ pub fn build_docker_image(
243253
docker_build.args(&["--build-arg", "VERBOSE=1"]);
244254
}
245255

256+
docker_build.args(&["--build-arg", &format!("CROSS_IMAGE={}", target.image_name(&repository, "0.2.4")]);
257+
246258
if target.needs_workspace_root_context() {
247259
docker_build.arg(&root);
248260
} else {

0 commit comments

Comments
 (0)