mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-22 14:55:26 +00:00
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.
This commit is contained in:
commit
3fd41d61ab
7
configure
vendored
7
configure
vendored
@ -849,13 +849,6 @@ then
|
|||||||
putvar CFG_LOCAL_RUST_ROOT
|
putvar CFG_LOCAL_RUST_ROOT
|
||||||
fi
|
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
|
# Force bitrig to build with clang; gcc doesn't like us there
|
||||||
if [ $CFG_OSTYPE = unknown-bitrig ]
|
if [ $CFG_OSTYPE = unknown-bitrig ]
|
||||||
then
|
then
|
||||||
|
@ -18,11 +18,6 @@ pub fn opts() -> TargetOptions {
|
|||||||
executables: true,
|
executables: true,
|
||||||
morestack: true,
|
morestack: true,
|
||||||
has_rpath: 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()
|
.. Default::default()
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user