diff options
| author | bors <bors@rust-lang.org> | 2017-04-21 16:36:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-04-21 16:36:41 +0000 |
| commit | 1785bca5137fad1f26e4d3c347cbb68408a28fa9 (patch) | |
| tree | 61e50c071b66f8628a4b2016c69b0387568270f5 /src/bootstrap | |
| parent | 5695c3e9435a5872e23a6bb61c1ea0b3ada83eef (diff) | |
| parent | 35dd55d00793863fc6883c3c3d23b89416273881 (diff) | |
| download | rust-1785bca5137fad1f26e4d3c347cbb68408a28fa9.tar.gz rust-1785bca5137fad1f26e4d3c347cbb68408a28fa9.zip | |
Auto merge of #41445 - frewsxcv:rollup, r=frewsxcv
Rollup of 4 pull requests - Successful merges: #41372, #41376, #41426, #41429 - Failed merges:
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"])); |