diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-12-19 10:29:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-19 10:29:54 +0100 |
| commit | 0f19977797f9cf0416a620be2fb44a5b2b70cb6f (patch) | |
| tree | 4ba855465d113f829cc968308b15e98c412f0d88 | |
| parent | bd8862340d8b26b146389ec66441bbd754843b9a (diff) | |
| parent | 6c7c5120200b711262f1c67f1924ae0835080286 (diff) | |
| download | rust-0f19977797f9cf0416a620be2fb44a5b2b70cb6f.tar.gz rust-0f19977797f9cf0416a620be2fb44a5b2b70cb6f.zip | |
Rollup merge of #67286 - cuviper:configure-llvm, r=Dylan-DPC
Fix the configure.py TOML field for a couple LLVM options The actual fields in `config.toml.example` have dashes, not underscores.
| -rwxr-xr-x | src/bootstrap/configure.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py index bb6041d7f31..7cfc5385e21 100755 --- a/src/bootstrap/configure.py +++ b/src/bootstrap/configure.py @@ -59,13 +59,13 @@ o("full-tools", None, "enable all tools") o("lld", "rust.lld", "build lld") o("lldb", "rust.lldb", "build lldb") o("missing-tools", "dist.missing-tools", "allow failures when building tools") -o("use-libcxx", "llvm.use_libcxx", "build LLVM with libc++") +o("use-libcxx", "llvm.use-libcxx", "build LLVM with libc++") o("cflags", "llvm.cflags", "build LLVM with these extra compiler flags") o("cxxflags", "llvm.cxxflags", "build LLVM with these extra compiler flags") o("ldflags", "llvm.ldflags", "build LLVM with these extra linker flags") -o("llvm-libunwind", "rust.llvm_libunwind", "use LLVM libunwind") +o("llvm-libunwind", "rust.llvm-libunwind", "use LLVM libunwind") # Optimization and debugging options. These may be overridden by the release # channel, etc. |
