diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-04-21 08:40:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-21 08:40:35 -0400 |
| commit | d5bbeb1a0a1e321c8c15bf7832ce78feb7e37d8e (patch) | |
| tree | 6429170b95aac44a65c7455954bdff4ecee0fd96 /src/bootstrap | |
| parent | d983256f36bb31149bc6af9b48f4370678a5cae2 (diff) | |
| parent | 51cc0e38e34d5ded08403bae351ecf4ee317573d (diff) | |
| download | rust-d5bbeb1a0a1e321c8c15bf7832ce78feb7e37d8e.tar.gz rust-d5bbeb1a0a1e321c8c15bf7832ce78feb7e37d8e.zip | |
Rollup merge of #41426 - malbarbo:android-x86_64, r=alexcrichton
Add x86_64-linux-android target
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/config.rs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index 693114d01ad..34fbc33d981 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -570,6 +570,12 @@ impl Config { .or_insert(Target::default()); target.ndk = Some(parse_configure_path(value)); } + "CFG_X86_64_LINUX_ANDROID_NDK" if value.len() > 0 => { + let target = "x86_64-linux-android".to_string(); + let target = self.target_config.entry(target) + .or_insert(Target::default()); + target.ndk = Some(parse_configure_path(value)); + } "CFG_LOCAL_RUST_ROOT" if value.len() > 0 => { let path = parse_configure_path(value); self.rustc = Some(push_exe_path(path.clone(), &["bin", "rustc"])); |