Skip to content

Commit

Permalink
Auto merge of #32375 - phil-opp:patch-1, r=japaric
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bors committed Mar 20, 2016
2 parents 173676e + 9532602 commit 978bc07
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/librustc_back/target/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
//! this module defines the format the JSON file should take, though each
//! underscore in the field names should be replaced with a hyphen (`-`) in the
//! JSON file. Some fields are required in every target specification, such as
//! `data-layout`, `llvm-target`, `target-endian`, `target-pointer-width`, and
//! `arch`. In general, options passed to rustc with `-C` override the target's
//! `llvm-target`, `target-endian`, `target-pointer-width`, `arch`, and
//! `os`. In general, options passed to rustc with `-C` override the target's
//! settings, though `target-feature` and `link-args` will *add* to the list
//! specified by the target, rather than replace.
Expand Down

0 comments on commit 978bc07

Please sign in to comment.