Skip to content

Commit

Permalink
Rollup merge of rust-lang#61705 - petrhosek:llvm-cflags, r=alexcrichton
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Centril committed Jun 12, 2019
2 parents ba5b04a + 715578e commit adea131
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/bootstrap/native.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit adea131

Please sign in to comment.