From 31764a98ffb33adc99b30482c2b70ee076bc0adb Mon Sep 17 00:00:00 2001 From: Will Andrews Date: Sat, 23 May 2015 14:02:00 -0600 Subject: [PATCH 1/2] Don't force FreeBSD to use clang. Newer gcc can be installed, so it should be used if possible. Checks elsewhere in configure should enforce this. --- configure | 7 ------- 1 file changed, 7 deletions(-) diff --git a/configure b/configure index efa836ca976..4537615bb12 100755 --- a/configure +++ b/configure @@ -848,13 +848,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 From b5ad86f98a64e2a2990b5313af62ab3f97b51125 Mon Sep 17 00:00:00 2001 From: Will Andrews Date: Sat, 23 May 2015 14:02:52 -0600 Subject: [PATCH 2/2] FreeBSD: Don't add -L/usr/local/lib{,/gcc4[46]}. The first one in particular results in Rust not being able to build itself if it is installed. The latter two shouldn't be necessary, and should only be included if they are actually going to be used. --- src/librustc_back/target/freebsd_base.rs | 5 ----- 1 file changed, 5 deletions(-) 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() }