diff options
| author | Peter Collingbourne <pcc@google.com> | 2022-10-12 17:02:31 -0700 |
|---|---|---|
| committer | Peter Collingbourne <pcc@google.com> | 2023-10-23 12:15:20 -0700 |
| commit | aad44b3b5420bdb0baa963cda669d7f2b1d9cf61 (patch) | |
| tree | e5c68bde2ab5ac083a24dee595afe0106cf83366 /config.example.toml | |
| parent | 7db4a89d49a8ed3a5f79b6cc3d555696baa1bbc3 (diff) | |
| download | rust-aad44b3b5420bdb0baa963cda669d7f2b1d9cf61.tar.gz rust-aad44b3b5420bdb0baa963cda669d7f2b1d9cf61.zip | |
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.
Diffstat (limited to 'config.example.toml')
| -rw-r--r-- | config.example.toml | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/config.example.toml b/config.example.toml index 4f44121410e..66fa91d4bad 100644 --- a/config.example.toml +++ b/config.example.toml @@ -30,7 +30,7 @@ # # If `change-id` does not match the version that is currently running, # `x.py` will prompt you to update it and check the related PR for more details. -change-id = 115898 +change-id = 116998 # ============================================================================= # Tweaking how LLVM is compiled @@ -377,6 +377,9 @@ change-id = 115898 # this is not intended to be used during local development. #metrics = false +# Specify the location of the Android NDK. Used when targeting Android. +#android-ndk = "/path/to/android-ndk-r25b" + # ============================================================================= # General install configuration options # ============================================================================= @@ -756,12 +759,6 @@ change-id = 115898 # it must link to `libgcc_eh.a` to get a working output, and this option have no effect. #llvm-libunwind = 'no' if Linux, 'in-tree' if Fuchsia -# If this target is for Android, this option will be required to specify where -# the NDK for the target lives. This is used to find the C compiler to link and -# build native code. -# See `src/bootstrap/cc_detect.rs` for details. -#android-ndk = <none> (path) - # Build the sanitizer runtimes for this target. # This option will override the same option under [build] section. #sanitizers = build.sanitizers (bool) |