diff options
| author | bors <bors@rust-lang.org> | 2023-01-29 07:01:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-01-29 07:01:58 +0000 |
| commit | a29efccb1eff324c63454677688b5d7e08b5f40f (patch) | |
| tree | 54e850143adb07bfa0ae0f9c5b440a6736b2ab52 /compiler/rustc_codegen_llvm/src | |
| parent | 3cdd0197e78e2ca3403157617709bbfe18a3f0b5 (diff) | |
| parent | 4e8f7e4fc9d7849227f96cd55e46c0337c3fc416 (diff) | |
| download | rust-a29efccb1eff324c63454677688b5d7e08b5f40f.tar.gz rust-a29efccb1eff324c63454677688b5d7e08b5f40f.zip | |
Auto merge of #107435 - matthiaskrgr:rollup-if5h6yu, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #106618 (Disable `linux_ext` in wasm32 and fortanix rustdoc builds.) - #107097 (Fix def-use dominance check) - #107154 (library/std/sys_common: Define MIN_ALIGN for m68k-unknown-linux-gnu) - #107397 (Gracefully exit if --keep-stage flag is used on a clean source tree) - #107401 (remove the usize field from CandidateSource::AliasBound) - #107413 (make more pleasant to read) - #107422 (Also erase substs for new infcx in pin move error) - #107425 (Check for missing space between fat arrow and range pattern) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/context.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/context.rs b/compiler/rustc_codegen_llvm/src/context.rs index d9ccba07a34..32cd3a4efa2 100644 --- a/compiler/rustc_codegen_llvm/src/context.rs +++ b/compiler/rustc_codegen_llvm/src/context.rs @@ -191,7 +191,7 @@ pub unsafe fn create_module<'ll>( // // FIXME(#34960) let cfg_llvm_root = option_env!("CFG_LLVM_ROOT").unwrap_or(""); - let custom_llvm_used = cfg_llvm_root.trim() != ""; + let custom_llvm_used = !cfg_llvm_root.trim().is_empty(); if !custom_llvm_used && target_data_layout != llvm_data_layout { bug!( |