27 lines
938 B
Rust
27 lines
938 B
Rust
$NetBSD: patch-src_bootstrap_builder.rs,v 1.11 2020/07/06 13:56:32 he Exp $
|
|
|
|
Do not install 'src'.
|
|
Use @PREFIX@, not $ORIGIN in rpath.
|
|
|
|
Fix RPATH for pkgsrc.
|
|
|
|
--- src/bootstrap/builder.rs.orig 2020-11-16 14:01:53.000000000 +0000
|
|
+++ src/bootstrap/builder.rs
|
|
@@ -475,7 +475,6 @@ impl<'a> Builder<'a> {
|
|
install::Clippy,
|
|
install::Miri,
|
|
install::Analysis,
|
|
- install::Src,
|
|
install::Rustc
|
|
),
|
|
Kind::Run => describe!(run::ExpandYamlAnchors, run::BuildManifest,),
|
|
@@ -1001,7 +1000,7 @@ impl<'a> Builder<'a> {
|
|
rustflags.arg("-Zosx-rpath-install-name");
|
|
Some("-Wl,-rpath,@loader_path/../lib")
|
|
} else if !target.contains("windows") {
|
|
- Some("-Wl,-rpath,$ORIGIN/../lib")
|
|
+ Some("-Wl,-rpath,@PREFIX@/lib")
|
|
} else {
|
|
None
|
|
};
|