about summary refs log tree commit diff
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-06-03 14:46:40 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-06-03 14:46:40 +0530
commit3fd41d61abba6df2d454c0a94f8f86ed14a4ba00 (patch)
tree2b816c1bd5a4db12f7f04cca982f21eba3253974
parent2c8d75d655b7d0bf84178f464c47a79569a35f3c (diff)
parentb5ad86f98a64e2a2990b5313af62ab3f97b51125 (diff)
downloadrust-3fd41d61abba6df2d454c0a94f8f86ed14a4ba00.tar.gz
rust-3fd41d61abba6df2d454c0a94f8f86ed14a4ba00.zip
Rollup merge of #25939 - wca:fix-freebsd-configure, r=alexcrichton
Bug fixes for configure on FreeBSD:
- Don't ban using gcc; newer versions can be installed and other checks should enforce its suitability.
- Don't force Rust to link itself with /usr/local/lib{,gcc4[46]}, which causes builds to fail if Rust is already installed.  I've not been able to find an use case where this is actually necessary.
-rwxr-xr-xconfigure7
-rw-r--r--src/librustc_back/target/freebsd_base.rs5
2 files changed, 0 insertions, 12 deletions
diff --git a/configure b/configure
index 9be47beeb91..92eb0935703 100755
--- a/configure
+++ b/configure
@@ -849,13 +849,6 @@ then
     putvar CFG_LOCAL_RUST_ROOT
 fi
 
-# Force freebsd to build with clang; gcc doesn't like us there
-if [ $CFG_OSTYPE = unknown-freebsd ]
-then
-    step_msg "on FreeBSD, forcing use of clang"
-    CFG_ENABLE_CLANG=1
-fi
-
 # Force bitrig to build with clang; gcc doesn't like us there
 if [ $CFG_OSTYPE = unknown-bitrig ]
 then
diff --git a/src/librustc_back/target/freebsd_base.rs b/src/librustc_back/target/freebsd_base.rs
index dcf1a12f2c9..3ec6307c72f 100644
--- a/src/librustc_back/target/freebsd_base.rs
+++ b/src/librustc_back/target/freebsd_base.rs
@@ -18,11 +18,6 @@ pub fn opts() -> TargetOptions {
         executables: true,
         morestack: true,
         has_rpath: true,
-        pre_link_args: vec!(
-            "-L/usr/local/lib".to_string(),
-            "-L/usr/local/lib/gcc46".to_string(),
-            "-L/usr/local/lib/gcc44".to_string(),
-        ),
 
         .. Default::default()
     }