about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2023-04-20 14:36:54 +0200
committerGitHub <noreply@github.com>2023-04-20 14:36:54 +0200
commitb577dd3977a0a3c88bbfc4d92133da9197343e19 (patch)
tree50c4f04c0a9aeea5875860a87c8ab5506ac5f488
parent17f6763a148a408a8016b657718148604a88ab4b (diff)
parent4bd363a286beb7cb3b9e842cefe377bd8f0dc401 (diff)
downloadrust-b577dd3977a0a3c88bbfc4d92133da9197343e19.tar.gz
rust-b577dd3977a0a3c88bbfc4d92133da9197343e19.zip
Rollup merge of #110574 - wangkirin:fix-out-of-date-comments, r=albertlarsan68
 fix out-of-date comment about rpath in bootstrap

in #64316   (https://github.com/rust-lang/rust/pull/64316/commits/1bec962f4687eacb09bf12955c93f6edfd6efee8),  the `RUSTC_RPATH`  enviroment variables had been removed , but the comments about the rpath still keep it
this PR fix it  to avoid misunstanding
-rw-r--r--src/bootstrap/builder.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index 3d3f991bffa..0d2d512b4b2 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -1589,8 +1589,8 @@ impl<'a> Builder<'a> {
         // which adds to the runtime dynamic loader path when looking for
         // dynamic libraries. We use this by default on Unix platforms to ensure
         // that our nightlies behave the same on Windows, that is they work out
-        // of the box. This can be disabled, of course, but basically that's why
-        // we're gated on RUSTC_RPATH here.
+        // of the box. This can be disabled by setting `rpath = false` in `[rust]`
+        // table of `config.toml`
         //
         // Ok, so the astute might be wondering "why isn't `-C rpath` used
         // here?" and that is indeed a good question to ask. This codegen