Skip to content

Commit 97447f2

Browse files
committed
Revert previous target-dir change
This doesn't actually work without some seriously hacky workarounds. A proper solution involves placing everything in one cargo workspace. That won't be practical until custom profiles are available (since the native library/binary require panic=unwind and the rel requires panic=abort) (see rust-lang/cargo#6988 for progress on that)
1 parent f322163 commit 97447f2

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

compile_to_ppc/.cargo/config

-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
[build]
2-
target-dir = "../target"
3-
41
[target.powerpc-unknown-linux-gnu]
52
rustflags = ["-C", "relocation-model=static", "-C", "target-cpu=750"]

generated/rel_files/build.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ fn invoke_cargo(ppc_manifest: &Path, package: &str)
2929
.arg("-C")
3030
.arg("target-cpu=750")
3131
.env("RUSTC_BOOTSTRAP", "1")
32-
.env("CARGO_TARGET_DIR", "../../target")
32+
.env("CARGO_TARGET_DIR", "../../compile_to_ppc/target")
3333
.output()
3434
.expect("Failed to compile ppc crate");
3535
if !output.status.success() {
@@ -49,6 +49,7 @@ fn main()
4949
let ppc_manifest = ppc_dir.join("Cargo.toml");
5050
let target_dir = ppc_dir
5151
.join("..")
52+
.join("compile_to_ppc")
5253
.join("target")
5354
.join("powerpc-unknown-linux-gnu")
5455
.join("release");

0 commit comments

Comments
 (0)