diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-06-12 04:22:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-12 04:22:55 +0200 |
| commit | adea1317c24738563a507b817bbf9c57471279f0 (patch) | |
| tree | d2553810f05910e8f4e9eb79497627ab8852b8cd /src/bootstrap | |
| parent | ba5b04ac46c0774479cf4e96c61b291e0b142f6b (diff) | |
| parent | 715578ea5769ccf21696fe64eed6971b19c1787c (diff) | |
| download | rust-adea1317c24738563a507b817bbf9c57471279f0.tar.gz rust-adea1317c24738563a507b817bbf9c57471279f0.zip | |
Rollup merge of #61705 - petrhosek:llvm-cflags, r=alexcrichton
Pass cflags rather than cxxflags to LLVM as CMAKE_C_FLAGS We mistakenly pass cxxflags from the configuration to LLVM build as CMAKE_C_FLAGS.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/native.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index bf3601cb312..8b6e856a8ab 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -416,7 +416,7 @@ fn configure_cmake(builder: &Builder<'_>, cfg.build_arg("-j").build_arg(builder.jobs().to_string()); let mut cflags = builder.cflags(target, GitRepo::Llvm).join(" "); - if let Some(ref s) = builder.config.llvm_cxxflags { + if let Some(ref s) = builder.config.llvm_cflags { cflags.push_str(&format!(" {}", s)); } cfg.define("CMAKE_C_FLAGS", cflags); |