bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Modify librustc_llvm to pass -DNDEBUG while compiling.

Browse source 
Currently, librustc_llvm builds are not reproducible because the LLVM
files it compiles use the debug version of llvm_unreachable, which
uses __FILE__.  To fix this, we propagate NDEBUG from bootstrap if
applicable and use it when compiling librustc_llvm.
This commit is contained in:
Joel Galenson 2019-08-15 12:55:03 -07:00
parent c01be67ea4
commit 191603653b
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/bootstrap/compile.rs
View file

@ -795,6 +795,9 @@ pub fn build_codegen_backend(builder: &Builder<'_>,
if builder.config.llvm_use_libcxx { if builder.config.llvm_use_libcxx {
cargo.env("LLVM_USE_LIBCXX", "1"); cargo.env("LLVM_USE_LIBCXX", "1");
} }
if builder.config.llvm_optimize && !builder.config.llvm_release_debuginfo {
cargo.env("LLVM_NDEBUG", "1");
}
} }
_ => panic!("unknown backend: {}", backend), _ => panic!("unknown backend: {}", backend),
} }

4
src/librustc_llvm/build.rs
View file

@ -151,6 +151,10 @@ fn main() {
cfg.define("LLVM_RUSTLLVM", None); cfg.define("LLVM_RUSTLLVM", None);
} }
if env::var_os("LLVM_NDEBUG").is_some() {
cfg.define("NDEBUG", None);
}
build_helper::rerun_if_changed_anything_in_dir(Path::new("../rustllvm")); build_helper::rerun_if_changed_anything_in_dir(Path::new("../rustllvm"));
cfg.file("../rustllvm/PassWrapper.cpp") cfg.file("../rustllvm/PassWrapper.cpp")
.file("../rustllvm/RustWrapper.cpp") .file("../rustllvm/RustWrapper.cpp")