diff options
| author | Jonas Schievink <jonasschievink@gmail.com> | 2020-11-11 20:59:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-11 20:59:10 +0100 |
| commit | 904b658303731b238d3aa2948db65a3130f50e2e (patch) | |
| tree | 2cc0fe49822e3e1252f36be867ba581ad4dfadde /compiler | |
| parent | 5ac0ae4ae4d61e1c3ad7eca38f0875731c9508eb (diff) | |
| parent | ce91c689432714938a9bd10860e5c0aa874226e2 (diff) | |
| download | rust-904b658303731b238d3aa2948db65a3130f50e2e.tar.gz rust-904b658303731b238d3aa2948db65a3130f50e2e.zip | |
Rollup merge of #78930 - petrochenkov:notlikeandroid, r=Mark-Simulacrum
rustc_taret: Remove `TargetOptions::is_like_android` This option was replaced by more specific options and is no longer used by the compiler.
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_target/src/spec/android_base.rs | 1 | ||||
| -rw-r--r-- | compiler/rustc_target/src/spec/mod.rs | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/compiler/rustc_target/src/spec/android_base.rs b/compiler/rustc_target/src/spec/android_base.rs index 40688f057f5..f6fbe7cd5f6 100644 --- a/compiler/rustc_target/src/spec/android_base.rs +++ b/compiler/rustc_target/src/spec/android_base.rs @@ -9,7 +9,6 @@ pub fn opts() -> TargetOptions { .get_mut(&LinkerFlavor::Gcc) .unwrap() .push("-Wl,--allow-multiple-definition".to_string()); - base.is_like_android = true; base.dwarf_version = Some(2); base.position_independent_executables = true; base.has_elf_tls = false; diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs index 271ceb2a036..f949bf95a50 100644 --- a/compiler/rustc_target/src/spec/mod.rs +++ b/compiler/rustc_target/src/spec/mod.rs @@ -824,9 +824,6 @@ pub struct TargetOptions { /// library naming convention. Defaults to false. pub is_like_windows: bool, pub is_like_msvc: bool, - /// Whether the target toolchain is like Android's. Only useful for compiling against Android. - /// Defaults to false. - pub is_like_android: bool, /// Whether the target toolchain is like Emscripten's. Only useful for compiling with /// Emscripten toolchain. /// Defaults to false. @@ -1034,7 +1031,6 @@ impl Default for TargetOptions { is_like_osx: false, is_like_solaris: false, is_like_windows: false, - is_like_android: false, is_like_emscripten: false, is_like_msvc: false, is_like_fuchsia: false, @@ -1477,7 +1473,6 @@ impl Target { key!(is_like_windows, bool); key!(is_like_msvc, bool); key!(is_like_emscripten, bool); - key!(is_like_android, bool); key!(is_like_fuchsia, bool); key!(dwarf_version, Option<u32>); key!(linker_is_gnu, bool); @@ -1713,7 +1708,6 @@ impl ToJson for Target { target_option_val!(is_like_windows); target_option_val!(is_like_msvc); target_option_val!(is_like_emscripten); - target_option_val!(is_like_android); target_option_val!(is_like_fuchsia); target_option_val!(dwarf_version); target_option_val!(linker_is_gnu); |