Skip to content

Commit 3fd41d6

Browse files
committed
Rollup merge of rust-lang#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.
2 parents 2c8d75d + b5ad86f commit 3fd41d6

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

configure

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -849,13 +849,6 @@ then
849849
putvar CFG_LOCAL_RUST_ROOT
850850
fi
851851

852-
# Force freebsd to build with clang; gcc doesn't like us there
853-
if [ $CFG_OSTYPE = unknown-freebsd ]
854-
then
855-
step_msg "on FreeBSD, forcing use of clang"
856-
CFG_ENABLE_CLANG=1
857-
fi
858-
859852
# Force bitrig to build with clang; gcc doesn't like us there
860853
if [ $CFG_OSTYPE = unknown-bitrig ]
861854
then

src/librustc_back/target/freebsd_base.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@ pub fn opts() -> TargetOptions {
1818
executables: true,
1919
morestack: true,
2020
has_rpath: true,
21-
pre_link_args: vec!(
22-
"-L/usr/local/lib".to_string(),
23-
"-L/usr/local/lib/gcc46".to_string(),
24-
"-L/usr/local/lib/gcc44".to_string(),
25-
),
2621

2722
.. Default::default()
2823
}

0 commit comments

Comments
 (0)