Skip to content

Commit aad44b3

Browse files
pccpcc
committed
Improve android-ndk property interface
PR #105716 added support for NDK r25b, and removed support for r15. Since the switch to r25b would have broken existing r15 users anyway, let's take the opportunity to make the interface more user friendly. Firstly move the android-ndk property to [build] instead of the targets. This is possible now that the NDK has obsoleted the concept of target-specific toolchains. Also make the property take the NDK root directory instead of the "toolchains/llvm/prebuilt/<host tag>" subdirectory.
1 parent 7db4a89 commit aad44b3

File tree

8 files changed

+62
-75
lines changed

8 files changed

+62
-75
lines changed

‎config.example.toml

+4-7
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#
3131
# If `change-id` does not match the version that is currently running,
3232
# `x.py` will prompt you to update it and check the related PR for more details.
33-
change-id = 115898
33+
change-id = 116998
3434

3535
# =============================================================================
3636
# Tweaking how LLVM is compiled
@@ -377,6 +377,9 @@ change-id = 115898
377377
# this is not intended to be used during local development.
378378
#metrics = false
379379

380+
# Specify the location of the Android NDK. Used when targeting Android.
381+
#android-ndk = "/path/to/android-ndk-r25b"
382+
380383
# =============================================================================
381384
# General install configuration options
382385
# =============================================================================
@@ -756,12 +759,6 @@ change-id = 115898
756759
# it must link to `libgcc_eh.a` to get a working output, and this option have no effect.
757760
#llvm-libunwind = 'no' if Linux, 'in-tree' if Fuchsia
758761

759-
# If this target is for Android, this option will be required to specify where
760-
# the NDK for the target lives. This is used to find the C compiler to link and
761-
# build native code.
762-
# See `src/bootstrap/cc_detect.rs` for details.
763-
#android-ndk = <none> (path)
764-
765762
# Build the sanitizer runtimes for this target.
766763
# This option will override the same option under [build] section.
767764
#sanitizers = build.sanitizers (bool)

‎src/bootstrap/bootstrap_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class GenerateAndParseConfig(unittest.TestCase):
103103
"""Test that we can serialize and deserialize a config.toml file"""
104104
def test_no_args(self):
105105
build = serialize_and_parse([])
106-
self.assertEqual(build.get_toml("change-id"), '115898')
106+
self.assertEqual(build.get_toml("change-id"), '116998')
107107
self.assertEqual(build.get_toml("profile"), 'dist')
108108
self.assertIsNone(build.get_toml("llvm.download-ci-llvm"))
109109

‎src/bootstrap/configure.py

+1-14
Original file line numberDiff line numberDiff line change
@@ -97,20 +97,7 @@ def v(*args):
9797
v("llvm-config", None, "set path to llvm-config")
9898
v("llvm-filecheck", None, "set path to LLVM's FileCheck utility")
9999
v("python", "build.python", "set path to python")
100-
v("android-cross-path", "target.arm-linux-androideabi.android-ndk",
101-
"Android NDK standalone path (deprecated)")
102-
v("i686-linux-android-ndk", "target.i686-linux-android.android-ndk",
103-
"i686-linux-android NDK standalone path")
104-
v("arm-linux-androideabi-ndk", "target.arm-linux-androideabi.android-ndk",
105-
"arm-linux-androideabi NDK standalone path")
106-
v("armv7-linux-androideabi-ndk", "target.armv7-linux-androideabi.android-ndk",
107-
"armv7-linux-androideabi NDK standalone path")
108-
v("thumbv7neon-linux-androideabi-ndk", "target.thumbv7neon-linux-androideabi.android-ndk",
109-
"thumbv7neon-linux-androideabi NDK standalone path")
110-
v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk",
111-
"aarch64-linux-android NDK standalone path")
112-
v("x86_64-linux-android-ndk", "target.x86_64-linux-android.android-ndk",
113-
"x86_64-linux-android NDK standalone path")
100+
v("android-ndk", "build.android-ndk", "set path to Android NDK")
114101
v("musl-root", "target.x86_64-unknown-linux-musl.musl-root",
115102
"MUSL root installation directory (deprecated)")
116103
v("musl-root-x86_64", "target.x86_64-unknown-linux-musl.musl-root",

‎src/bootstrap/src/core/config/config.rs

+5-12
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ use std::str::FromStr;
2121
use crate::core::build_steps::compile::CODEGEN_BACKEND_PREFIX;
2222
use crate::core::config::flags::{Color, Flags, Warnings};
2323
use crate::utils::cache::{Interned, INTERNER};
24-
use crate::utils::cc_detect::{ndk_compiler, Language};
2524
use crate::utils::channel::{self, GitInfo};
2625
use crate::utils::helpers::{exe, output, t};
2726
use build_helper::exit;
@@ -142,6 +141,7 @@ pub struct Config {
142141
pub color: Color,
143142
pub patch_binaries_for_nix: Option<bool>,
144143
pub stage0_metadata: Stage0Metadata,
144+
pub android_ndk: Option<PathBuf>,
145145

146146
pub stdout_is_tty: bool,
147147
pub stderr_is_tty: bool,
@@ -521,7 +521,6 @@ pub struct Target {
521521
pub ranlib: Option<PathBuf>,
522522
pub default_linker: Option<PathBuf>,
523523
pub linker: Option<PathBuf>,
524-
pub ndk: Option<PathBuf>,
525524
pub sanitizers: Option<bool>,
526525
pub profiler: Option<StringOrBool>,
527526
pub rpath: Option<bool>,
@@ -799,6 +798,7 @@ define_config! {
799798
patch_binaries_for_nix: Option<bool> = "patch-binaries-for-nix",
800799
// NOTE: only parsed by bootstrap.py, `--feature build-metrics` enables metrics unconditionally
801800
metrics: Option<bool> = "metrics",
801+
android_ndk: Option<PathBuf> = "android-ndk",
802802
}
803803
}
804804

@@ -1039,7 +1039,6 @@ define_config! {
10391039
llvm_has_rust_patches: Option<bool> = "llvm-has-rust-patches",
10401040
llvm_filecheck: Option<String> = "llvm-filecheck",
10411041
llvm_libunwind: Option<String> = "llvm-libunwind",
1042-
android_ndk: Option<String> = "android-ndk",
10431042
sanitizers: Option<bool> = "sanitizers",
10441043
profiler: Option<StringOrBool> = "profiler",
10451044
rpath: Option<bool> = "rpath",
@@ -1320,6 +1319,7 @@ impl Config {
13201319
config.python = build.python.map(PathBuf::from);
13211320
config.reuse = build.reuse.map(PathBuf::from);
13221321
config.submodules = build.submodules;
1322+
config.android_ndk = build.android_ndk;
13231323
set(&mut config.low_priority, build.low_priority);
13241324
set(&mut config.compiler_docs, build.compiler_docs);
13251325
set(&mut config.library_docs_private_items, build.library_docs_private_items);
@@ -1600,18 +1600,11 @@ impl Config {
16001600
.llvm_libunwind
16011601
.as_ref()
16021602
.map(|v| v.parse().expect("failed to parse rust.llvm-libunwind"));
1603-
if let Some(ref s) = cfg.android_ndk {
1604-
target.ndk = Some(config.src.join(s));
1605-
}
16061603
if let Some(s) = cfg.no_std {
16071604
target.no_std = s;
16081605
}
1609-
target.cc = cfg.cc.map(PathBuf::from).or_else(|| {
1610-
target.ndk.as_ref().map(|ndk| ndk_compiler(Language::C, &triple, ndk))
1611-
});
1612-
target.cxx = cfg.cxx.map(PathBuf::from).or_else(|| {
1613-
target.ndk.as_ref().map(|ndk| ndk_compiler(Language::CPlusPlus, &triple, ndk))
1614-
});
1606+
target.cc = cfg.cc.map(PathBuf::from);
1607+
target.cxx = cfg.cxx.map(PathBuf::from);
16151608
target.ar = cfg.ar.map(PathBuf::from);
16161609
target.ranlib = cfg.ranlib.map(PathBuf::from);
16171610
target.linker = cfg.linker.map(PathBuf::from);

‎src/bootstrap/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ const LLD_FILE_NAMES: &[&str] = &["ld.lld", "ld64.lld", "lld-link", "wasm-ld"];
7878
///
7979
/// If you make any major changes (such as adding new values or changing default values), please
8080
/// ensure that the associated PR ID is added to the end of this list.
81-
pub const CONFIG_CHANGE_HISTORY: &[usize] = &[115898];
81+
pub const CONFIG_CHANGE_HISTORY: &[usize] = &[115898, 116998];
8282

8383
/// Extra --check-cfg to add when building
8484
/// (Mode restriction, config name, config values (if any))

‎src/bootstrap/src/utils/cc_detect.rs

+48-33
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use std::path::{Path, PathBuf};
2626
use std::process::Command;
2727
use std::{env, iter};
2828

29-
use crate::core::config::{Target, TargetSelection};
29+
use crate::core::config::TargetSelection;
3030
use crate::utils::helpers::output;
3131
use crate::{Build, CLang, GitRepo};
3232

@@ -107,10 +107,11 @@ pub fn find(build: &Build) {
107107
pub fn find_target(build: &Build, target: TargetSelection) {
108108
let mut cfg = new_cc_build(build, target);
109109
let config = build.config.target_config.get(&target);
110-
if let Some(cc) = config.and_then(|c| c.cc.as_ref()) {
110+
if let Some(cc) = config
111+
.and_then(|c| c.cc.clone())
112+
.or_else(|| default_compiler(&mut cfg, Language::C, target, build))
113+
{
111114
cfg.compiler(cc);
112-
} else {
113-
set_compiler(&mut cfg, Language::C, target, config, build);
114115
}
115116

116117
let compiler = cfg.get_compiler();
@@ -127,12 +128,12 @@ pub fn find_target(build: &Build, target: TargetSelection) {
127128
// We'll need one anyways if the target triple is also a host triple
128129
let mut cfg = new_cc_build(build, target);
129130
cfg.cpp(true);
130-
let cxx_configured = if let Some(cxx) = config.and_then(|c| c.cxx.as_ref()) {
131+
let cxx_configured = if let Some(cxx) = config
132+
.and_then(|c| c.cxx.clone())
133+
.or_else(|| default_compiler(&mut cfg, Language::CPlusPlus, target, build))
134+
{
131135
cfg.compiler(cxx);
132136
true
133-
} else if build.hosts.contains(&target) || build.build == target {
134-
set_compiler(&mut cfg, Language::CPlusPlus, target, config, build);
135-
true
136137
} else {
137138
// Use an auto-detected compiler (or one configured via `CXX_target_triple` env vars).
138139
cfg.try_get_compiler().is_ok()
@@ -161,68 +162,70 @@ pub fn find_target(build: &Build, target: TargetSelection) {
161162
}
162163
}
163164

164-
fn set_compiler(
165+
fn default_compiler(
165166
cfg: &mut cc::Build,
166167
compiler: Language,
167168
target: TargetSelection,
168-
config: Option<&Target>,
169169
build: &Build,
170-
) {
170+
) -> Option<PathBuf> {
171171
match &*target.triple {
172172
// When compiling for android we may have the NDK configured in the
173173
// config.toml in which case we look there. Otherwise the default
174174
// compiler already takes into account the triple in question.
175-
t if t.contains("android") => {
176-
if let Some(ndk) = config.and_then(|c| c.ndk.as_ref()) {
177-
cfg.compiler(ndk_compiler(compiler, &*target.triple, ndk));
178-
}
179-
}
175+
t if t.contains("android") => build
176+
.config
177+
.android_ndk
178+
.as_ref()
179+
.map(|ndk| ndk_compiler(compiler, &*target.triple, ndk)),
180180

181181
// The default gcc version from OpenBSD may be too old, try using egcc,
182182
// which is a gcc version from ports, if this is the case.
183183
t if t.contains("openbsd") => {
184184
let c = cfg.get_compiler();
185185
let gnu_compiler = compiler.gcc();
186186
if !c.path().ends_with(gnu_compiler) {
187-
return;
187+
return None;
188188
}
189189

190190
let output = output(c.to_command().arg("--version"));
191-
let i = match output.find(" 4.") {
192-
Some(i) => i,
193-
None => return,
194-
};
191+
let i = output.find(" 4.")?;
195192
match output[i + 3..].chars().next().unwrap() {
196193
'0'..='6' => {}
197-
_ => return,
194+
_ => return None,
198195
}
199196
let alternative = format!("e{gnu_compiler}");
200197
if Command::new(&alternative).output().is_ok() {
201-
cfg.compiler(alternative);
198+
Some(PathBuf::from(alternative))
199+
} else {
200+
None
202201
}
203202
}
204203

205-
"mips-unknown-linux-musl" => {
204+
"mips-unknown-linux-musl" if compiler == Language::C => {
206205
if cfg.get_compiler().path().to_str() == Some("gcc") {
207-
cfg.compiler("mips-linux-musl-gcc");
206+
Some(PathBuf::from("mips-linux-musl-gcc"))
207+
} else {
208+
None
208209
}
209210
}
210-
"mipsel-unknown-linux-musl" => {
211+
"mipsel-unknown-linux-musl" if compiler == Language::C => {
211212
if cfg.get_compiler().path().to_str() == Some("gcc") {
212-
cfg.compiler("mipsel-linux-musl-gcc");
213+
Some(PathBuf::from("mipsel-linux-musl-gcc"))
214+
} else {
215+
None
213216
}
214217
}
215218

216-
t if t.contains("musl") => {
219+
t if t.contains("musl") && compiler == Language::C => {
217220
if let Some(root) = build.musl_root(target) {
218221
let guess = root.join("bin/musl-gcc");
219-
if guess.exists() {
220-
cfg.compiler(guess);
221-
}
222+
if guess.exists() { Some(guess) } else { None }
223+
} else {
224+
None
222225
}
223226
}
224227

225-
_ => {}
228+
_ => None,
226229
}
227230
}
228231

@@ -243,10 +246,22 @@ pub(crate) fn ndk_compiler(compiler: Language, triple: &str, ndk: &Path) -> Path
243246
let api_level =
244247
if triple.contains("aarch64") || triple.contains("x86_64") { "21" } else { "19" };
245248
let compiler = format!("{}{}-{}", triple_translated, api_level, compiler.clang());
246-
ndk.join("bin").join(compiler)
249+
let host_tag = if cfg!(target_os = "macos") {
250+
// The NDK uses universal binaries, so this is correct even on ARM.
251+
"darwin-x86_64"
252+
} else if cfg!(target_os = "windows") {
253+
"windows-x86_64"
254+
} else {
255+
// NDK r25b only has official releases for macOS, Windows and Linux.
256+
// Try the Linux directory everywhere else, on the assumption that the OS has an
257+
// emulation layer that can cope (e.g. BSDs).
258+
"linux-x86_64"
259+
};
260+
ndk.join("toolchains").join("llvm").join("prebuilt").join(host_tag).join("bin").join(compiler)
247261
}
248262

249263
/// The target programming language for a native compiler.
264+
#[derive(PartialEq)]
250265
pub(crate) enum Language {
251266
/// The compiler is targeting C.
252267
C,

‎src/ci/docker/host-x86_64/arm-android/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ENV PATH=$PATH:/android/sdk/platform-tools
3030

3131
ENV TARGETS=arm-linux-androideabi
3232

33-
ENV RUST_CONFIGURE_ARGS --arm-linux-androideabi-ndk=/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/
33+
ENV RUST_CONFIGURE_ARGS --android-ndk=/android/ndk/
3434

3535
ENV SCRIPT python3 ../x.py --stage 2 test --host='' --target $TARGETS
3636

‎src/ci/docker/host-x86_64/dist-android/Dockerfile

+1-6
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,7 @@ ENV TARGETS=$TARGETS,x86_64-linux-android
1919
ENV RUST_CONFIGURE_ARGS \
2020
--enable-extended \
2121
--enable-profiler \
22-
--arm-linux-androideabi-ndk=/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/ \
23-
--armv7-linux-androideabi-ndk=/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/ \
24-
--thumbv7neon-linux-androideabi-ndk=/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/ \
25-
--i686-linux-android-ndk=/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/ \
26-
--aarch64-linux-android-ndk=/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/ \
27-
--x86_64-linux-android-ndk=/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/ \
22+
--android-ndk=/android/ndk/ \
2823
--disable-docs
2924

3025
ENV SCRIPT python3 ../x.py dist --host='' --target $TARGETS

0 commit comments

Comments
 (0)