X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=config.toml.example;h=9121d1e17992657ed18cf73b9b974823a66bd1d6;hb=649b6323cd20d4a454264798c189107fd1eda33f;hp=ce21b63467f53f566b302a3021479f42e49ca066;hpb=8212a1c7dcd4172c0cb8345f40191566abc0afb3;p=rust.git diff --git a/config.toml.example b/config.toml.example index ce21b63467f..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 @@ -168,11 +169,9 @@ # Python interpreter to use for various tasks throughout the build, notably # rustdoc tests, the lldb python interpreter, and some dist bits and pieces. -# Note that Python 2 is currently required. # -# Defaults to python2.7, then python2. If neither executable can be found, then -# it defaults to the Python interpreter used to execute x.py. -#python = "python2.7" +# Defaults to the Python interpreter used to execute x.py. +#python = "python" # Force Cargo to check that Cargo.lock describes the precise dependency # set that all the Cargo.toml files create, instead of updating it.