Skip to content

Commit 904b658

Browse files
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.
2 parents 5ac0ae4 + ce91c68 commit 904b658

File tree

2 files changed

+0
-7
lines changed

2 files changed

+0
-7
lines changed

compiler/rustc_target/src/spec/android_base.rs

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ pub fn opts() -> TargetOptions {
99
.get_mut(&LinkerFlavor::Gcc)
1010
.unwrap()
1111
.push("-Wl,--allow-multiple-definition".to_string());
12-
base.is_like_android = true;
1312
base.dwarf_version = Some(2);
1413
base.position_independent_executables = true;
1514
base.has_elf_tls = false;

compiler/rustc_target/src/spec/mod.rs

-6
Original file line numberDiff line numberDiff line change
@@ -824,9 +824,6 @@ pub struct TargetOptions {
824824
/// library naming convention. Defaults to false.
825825
pub is_like_windows: bool,
826826
pub is_like_msvc: bool,
827-
/// Whether the target toolchain is like Android's. Only useful for compiling against Android.
828-
/// Defaults to false.
829-
pub is_like_android: bool,
830827
/// Whether the target toolchain is like Emscripten's. Only useful for compiling with
831828
/// Emscripten toolchain.
832829
/// Defaults to false.
@@ -1034,7 +1031,6 @@ impl Default for TargetOptions {
10341031
is_like_osx: false,
10351032
is_like_solaris: false,
10361033
is_like_windows: false,
1037-
is_like_android: false,
10381034
is_like_emscripten: false,
10391035
is_like_msvc: false,
10401036
is_like_fuchsia: false,
@@ -1477,7 +1473,6 @@ impl Target {
14771473
key!(is_like_windows, bool);
14781474
key!(is_like_msvc, bool);
14791475
key!(is_like_emscripten, bool);
1480-
key!(is_like_android, bool);
14811476
key!(is_like_fuchsia, bool);
14821477
key!(dwarf_version, Option<u32>);
14831478
key!(linker_is_gnu, bool);
@@ -1713,7 +1708,6 @@ impl ToJson for Target {
17131708
target_option_val!(is_like_windows);
17141709
target_option_val!(is_like_msvc);
17151710
target_option_val!(is_like_emscripten);
1716-
target_option_val!(is_like_android);
17171711
target_option_val!(is_like_fuchsia);
17181712
target_option_val!(dwarf_version);
17191713
target_option_val!(linker_is_gnu);

0 commit comments

Comments
 (0)