diff options
| author | bors <bors@rust-lang.org> | 2023-06-04 11:09:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-06-04 11:09:58 +0000 |
| commit | a28e125b2130c179e40023317b7c6004c08442ff (patch) | |
| tree | 863eda64545db209c69e3dfa30be7b6b42f51438 | |
| parent | 9eee230cd0a56bfba3ce65121798d9f9f4341cdd (diff) | |
| parent | 91471c8da1594935389e360d1548a3cf511768f2 (diff) | |
| download | rust-a28e125b2130c179e40023317b7c6004c08442ff.tar.gz rust-a28e125b2130c179e40023317b7c6004c08442ff.zip | |
Auto merge of #109525 - bzEq:aix-bootstrap-no-rpath, r=Mark-Simulacrum
Rpath is not supported on AIX Both `-Wl,-rapth` and `-Wl,-z,origin` are not supported on AIX. AIX linker is documented in https://www.ibm.com/docs/en/aix/7.1?topic=l-ld-command.
| -rw-r--r-- | src/bootstrap/builder.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 3b9270f563c..86060c8d3d8 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -1635,7 +1635,7 @@ impl<'a> Builder<'a> { // flesh out rpath support more fully in the future. rustflags.arg("-Zosx-rpath-install-name"); Some("-Wl,-rpath,@loader_path/../lib") - } else if !target.contains("windows") { + } else if !target.contains("windows") && !target.contains("aix") { rustflags.arg("-Clink-args=-Wl,-z,origin"); Some("-Wl,-rpath,$ORIGIN/../lib") } else { |