diff options
| author | bors <bors@rust-lang.org> | 2020-04-13 07:34:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-13 07:34:11 +0000 |
| commit | d28a46444eacf066ea0e7fdf6eda066e315aaa4a (patch) | |
| tree | 57d6ae5f460bb51e354813f95b0778b9b3ad9f03 /config.toml.example | |
| parent | a00bd29e01c4042143d01681e45723a2052412b0 (diff) | |
| parent | 7c5a4cdd669c9816df938a878147fe5b4645e951 (diff) | |
| download | rust-d28a46444eacf066ea0e7fdf6eda066e315aaa4a.tar.gz rust-d28a46444eacf066ea0e7fdf6eda066e315aaa4a.zip | |
Auto merge of #70882 - tmiasko:llvm-version-suffix, r=Mark-Simulacrum
Make LLVM version suffix independent of rustc version on dev channel Remove rustc version from LLVM version suffix on dev channel, avoiding the need for full rebuilds when switching between branches with different LLVM submodule & rustc version. Note: To avoid full rebuild, on subsequent LLVM submodule update, copy the current value of `LLVM_VERSION_SUFFIX` from `build/*/llvm/build/CMakeCache.txt`, to `version-suffix` in `config.toml`.
Diffstat (limited to 'config.toml.example')
| -rw-r--r-- | config.toml.example | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config.toml.example b/config.toml.example index d4a77bb2960..9121d1e1799 100644 --- a/config.toml.example +++ b/config.toml.example @@ -84,8 +84,9 @@ #link-shared = false # When building llvm, this configures what is being appended to the version. -# If absent, we let the version as-is. -#version-suffix = "-rust" +# The default is "-rust-$version-$channel", except for dev channel where rustc +# version number is omitted. To use LLVM version as is, provide an empty string. +#version-suffix = "-rust-dev" # On MSVC you can compile LLVM with clang-cl, but the test suite doesn't pass # with clang-cl, so this is special in that it only compiles LLVM with clang-cl |