diff options
| author | bors <bors@rust-lang.org> | 2016-03-20 10:30:38 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-03-20 10:30:38 -0700 |
| commit | 978bc070a66f7f4f82dc0f2c4a4e4e35478851b6 (patch) | |
| tree | e1b815bec2f60c791dbba1519bce3d4b5ebe97de | |
| parent | 173676efdc8a9f1f2a86d37c08a104e2e505f9e4 (diff) | |
| parent | 953260208acd1ba548b10996a426985804119aa2 (diff) | |
| download | rust-978bc070a66f7f4f82dc0f2c4a4e4e35478851b6.tar.gz rust-978bc070a66f7f4f82dc0f2c4a4e4e35478851b6.zip | |
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 958d5638254958ea42652de7444b63f2e67e7fe3. The `os` field is always required. Related to #31367
| -rw-r--r-- | src/librustc_back/target/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs index 266144f61de..ab5a63a5470 100644 --- a/src/librustc_back/target/mod.rs +++ b/src/librustc_back/target/mod.rs @@ -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. |