nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-16 17:03:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

rustc_back: add configure options for default linker and ar

Browse Source 
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
This commit is contained in:
Marc-Antoine Perennou 2015-08-11 01:09:21 +02:00
parent aca2057ed5
commit c977596992
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -607,6 +607,10 @@ valopt aarch64-linux-android-ndk "" "aarch64-linux-android NDK standalone path"
valopt release-channel "dev" "the name of the release channel to build" valopt release-channel "dev" "the name of the release channel to build"
valopt musl-root "/usr/local" "MUSL root installation directory" valopt musl-root "/usr/local" "MUSL root installation directory"
# Used on systems where "cc" and "ar" are unavailable
valopt default-linker "cc" "the default linker"
valopt default-ar "ar" "the default ar"
# Many of these are saved below during the "writing configuration" step # Many of these are saved below during the "writing configuration" step
# (others are conditionally saved). # (others are conditionally saved).
opt_nosave manage-submodules 1 "let the build manage the git submodules" opt_nosave manage-submodules 1 "let the build manage the git submodules"

4
mk/target.mk
View File

@ -13,6 +13,10 @@
# this exists can be found on issue #2400 # this exists can be found on issue #2400
export CFG_COMPILER_HOST_TRIPLE export CFG_COMPILER_HOST_TRIPLE
# Used as defaults for the runtime ar and cc tools
export CFG_DEFAULT_LINKER
export CFG_DEFAULT_AR
# The standard libraries should be held up to a higher standard than any old # The standard libraries should be held up to a higher standard than any old
# code, make sure that these common warnings are denied by default. These can # code, make sure that these common warnings are denied by default. These can
# be overridden during development temporarily. For stage0, we allow warnings # be overridden during development temporarily. For stage0, we allow warnings

4
src/librustc_back/target/mod.rs
View File

@ -185,8 +185,8 @@ impl Default for TargetOptions {
fn default() -> TargetOptions { fn default() -> TargetOptions {
TargetOptions { TargetOptions {
data_layout: String::new(), data_layout: String::new(),
linker: "cc".to_string(), linker: option_env!("CFG_DEFAULT_LINKER").unwrap_or("cc").to_string(),
ar: "ar".to_string(), ar: option_env!("CFG_DEFAULT_AR").unwrap_or("ar").to_string(),
pre_link_args: Vec::new(), pre_link_args: Vec::new(),
post_link_args: Vec::new(), post_link_args: Vec::new(),
cpu: "generic".to_string(), cpu: "generic".to_string(),