Skip to content

Commit

Permalink
hack powerpc64 and solaris
Browse files Browse the repository at this point in the history
  • Loading branch information
Emilgardis committed Feb 4, 2023
1 parent 8f22bbf commit 23a6283
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
2 changes: 2 additions & 0 deletions Dockerfile.hack
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ARG CROSS_IMAGE
FROM $CROSS_IMAGE
12 changes: 11 additions & 1 deletion xtask/src/build_docker_image.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,17 @@ fn locate_dockerfile(
} else {
eyre::bail!("unable to find dockerfile for target \"{target}\"");
};
let dockerfile = dockerfile_root.join(dockerfile_name).to_utf8()?.to_string();
let dockerfile = if matches!(
target.triplet.as_str(),
"powerpc64-unknown-linux-gnu" | "x86_64-sun-solaris"
) {
crate::util::project_dir(&mut <_>::default())?
.join("Dockerfile.hack")
.to_utf8()?
.to_string()
} else {
dockerfile_root.join(dockerfile_name).to_utf8()?.to_string()
};
Ok((target, dockerfile))
}

Expand Down

0 comments on commit 23a6283

Please sign in to comment.