Skip to content

Commit 978bc07

Browse files
committed
Auto merge of #32375 - phil-opp:patch-1, r=japaric
docs: The `data-layout` field is no longer required in custom targets The `data-layout` field is no longer required. It was made optional in 958d563. The `os` field is always required. Related to #31367
2 parents 173676e + 9532602 commit 978bc07

File tree

1 file changed

+2
-2
lines changed
  • src/librustc_back/target

1 file changed

+2
-2
lines changed

Diff for: src/librustc_back/target/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
//! this module defines the format the JSON file should take, though each
4141
//! underscore in the field names should be replaced with a hyphen (`-`) in the
4242
//! JSON file. Some fields are required in every target specification, such as
43-
//! `data-layout`, `llvm-target`, `target-endian`, `target-pointer-width`, and
44-
//! `arch`. In general, options passed to rustc with `-C` override the target's
43+
//! `llvm-target`, `target-endian`, `target-pointer-width`, `arch`, and
44+
//! `os`. In general, options passed to rustc with `-C` override the target's
4545
//! settings, though `target-feature` and `link-args` will *add* to the list
4646
//! specified by the target, rather than replace.
4747

0 commit comments

Comments
 (0)