diff options
| author | bors <bors@rust-lang.org> | 2022-06-13 23:36:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-06-13 23:36:51 +0000 |
| commit | 3bdec3c8abdc48e46715d7b14b764af28da1cee3 (patch) | |
| tree | b72fb84b835e64cc9e6de4c5fc71491b96711fb0 /compiler/rustc_codegen_llvm/src/back/write.rs | |
| parent | ca122c7ebb3ab50149c9d3d24ddb59c252b32272 (diff) | |
| parent | aa71be1b39d7b672414c622093e906e81aa06351 (diff) | |
| download | rust-3bdec3c8abdc48e46715d7b14b764af28da1cee3.tar.gz rust-3bdec3c8abdc48e46715d7b14b764af28da1cee3.zip | |
Auto merge of #98075 - JohnTitor:rollup-nqwodnk, r=JohnTitor
Rollup of 4 pull requests Successful merges: - #95211 (Improve parser diagnostics) - #95243 (Add Apple WatchOS compile targets) - #97385 (Add WIP stable MIR crate) - #97508 (Harden bad placeholder checks on statics/consts) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/back/write.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/back/write.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/back/write.rs b/compiler/rustc_codegen_llvm/src/back/write.rs index 3864db9ffc1..d05d09a11ea 100644 --- a/compiler/rustc_codegen_llvm/src/back/write.rs +++ b/compiler/rustc_codegen_llvm/src/back/write.rs @@ -1036,7 +1036,8 @@ unsafe fn embed_bitcode( // reason (see issue #90326 for historical background). let is_apple = cgcx.opts.target_triple.triple().contains("-ios") || cgcx.opts.target_triple.triple().contains("-darwin") - || cgcx.opts.target_triple.triple().contains("-tvos"); + || cgcx.opts.target_triple.triple().contains("-tvos") + || cgcx.opts.target_triple.triple().contains("-watchos"); if is_apple || cgcx.opts.target_triple.triple().starts_with("wasm") || cgcx.opts.target_triple.triple().starts_with("asmjs") |