about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-09-08 22:22:36 +0000
committerbors <bors@rust-lang.org>2015-09-08 22:22:36 +0000
commit24e54aebd09de2a75c1c6ef9763ee05c9d281e71 (patch)
tree91cda69f7f6205632cdfecf842b11d43da4fafec
parent8115b397f6df6a9f2b109dcadb31b21535f976bd (diff)
parent1fac7f89041a5fbc1d5636dd3546180de2c609ac (diff)
downloadrust-24e54aebd09de2a75c1c6ef9763ee05c9d281e71.tar.gz
rust-24e54aebd09de2a75c1c6ef9763ee05c9d281e71.zip
Auto merge of #28264 - mneumann:dragonfly_backend_fixes2, r=alexcrichton
Having -L/usr/local/lib in the linking path by default interferes
with an already installed version of Rust during building of Rust.
-rw-r--r--src/librustc_back/target/dragonfly_base.rs2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/librustc_back/target/dragonfly_base.rs b/src/librustc_back/target/dragonfly_base.rs
index 716d61c2958..41c5f36099e 100644
--- a/src/librustc_back/target/dragonfly_base.rs
+++ b/src/librustc_back/target/dragonfly_base.rs
@@ -19,8 +19,6 @@ pub fn opts() -> TargetOptions {
         linker_is_gnu: true,
         has_rpath: true,
         pre_link_args: vec!(
-            "-L/usr/local/lib".to_string(),
-            "-L/usr/lib/gcc47".to_string(),
             // GNU-style linkers will use this to omit linking to libraries
             // which don't actually fulfill any relocations, but only for
             // libraries which follow this flag.  Thus, use it before