Skip to content

Commit dffc864

Browse files
committed
bootstrap: builder: don't add origin paths on xous
Don't add the origin rpath when calling the linker. This is unnecessary on Xous since there is no dynamic linker, and Xous can use an ordinary bare-metal linker with no rpath options. As part of this patch, the logic was inverted so that the "else" clause contains everything except "windows" and "xous". Signed-off-by: Sean Cross <sean@xobs.io>
1 parent 112d101 commit dffc864

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/bootstrap/builder.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1635,7 +1635,10 @@ impl<'a> Builder<'a> {
16351635
// flesh out rpath support more fully in the future.
16361636
rustflags.arg("-Zosx-rpath-install-name");
16371637
Some(format!("-Wl,-rpath,@loader_path/../{libdir}"))
1638-
} else if !target.contains("windows") && !target.contains("aix") {
1638+
} else if !target.contains("windows")
1639+
&& !target.contains("aix")
1640+
&& !target.contains("xous")
1641+
{
16391642
rustflags.arg("-Clink-args=-Wl,-z,origin");
16401643
Some(format!("-Wl,-rpath,$ORIGIN/../{libdir}"))
16411644
} else {

0 commit comments

Comments
 (0)