Teach bootstrap about target files vs target triples #74251

shepmaster · 2020-07-11T19:02:40Z

rustc allows passing in predefined target triples as well as JSON
target specification files. This change allows bootstrap to have the
first inkling about those differences. This allows building a
cross-compiler for an out-of-tree architecture (even though that
compiler won't work for other reasons).

Even if no one ever uses this functionality, I think the newtype
around the Interned<String> improves the readability of the code.

rust-highfive · 2020-07-11T19:02:44Z

r? @Mark-Simulacrum

(rust_highfive has picked a reviewer for you, use r? to override)

bors · 2020-07-12T12:32:54Z

☔ The latest upstream changes (presumably #74245) made this pull request unmergeable. Please resolve the merge conflicts.

Mark-Simulacrum

r=me with nit fixed, and presuming this works for your use case :)

src/bootstrap/config.rs

shepmaster · 2020-07-13T00:17:33Z

@bors r=@Mark-Simulacrum rollup

bors · 2020-07-13T00:17:34Z

📌 Commit c24b96d has been approved by Mark-Simulacrum

bors · 2020-07-13T00:17:35Z

🌲 The tree is currently closed for pull requests below priority 20, this pull request will be tested once the tree is reopened

…r=Mark-Simulacrum Teach bootstrap about target files vs target triples `rustc` allows passing in predefined target triples as well as JSON target specification files. This change allows bootstrap to have the first inkling about those differences. This allows building a cross-compiler for an out-of-tree architecture (even though that compiler won't work for other reasons). Even if no one ever uses this functionality, I think the newtype around the `Interned<String>` improves the readability of the code.

Manishearth · 2020-07-14T01:03:45Z

@bors r- rollup-

This broke the ignore-wasm32-bare annotation in compiletest

#74308 (comment)

Also I'd avoid marking build system PRs as rollup, that annotation is for things which have a very low chance of failing CI (doc PRs, etc)

eddyb · 2020-07-14T02:12:54Z

@Manishearth I'm no so sure this PR broke wasm, the test fails w/o it: #74309 (comment)

shepmaster · 2020-07-15T00:16:21Z

Based on previous comments that this doesn't have an issue but leaving off rollup as directed...

@bors r=@Mark-Simulacrum

bors · 2020-07-15T00:16:22Z

📌 Commit c24b96d has been approved by Mark-Simulacrum

@ghost

…arth Rollup of 14 pull requests Successful merges: - rust-lang#72973 (RISC-V GNU/Linux as host platform) - rust-lang#73918 (Clean up E0715 explanation) - rust-lang#73959 (Clean up E0716 explanation) - rust-lang#74119 (Remove `Compiler::compile()`.) - rust-lang#74196 (Add option to collapse automatically implementors) - rust-lang#74218 (Add margin after doc search results) - rust-lang#74276 (improve DiscriminantKind handling) - rust-lang#74291 (Added docs for `From<c_int>` for `ExitStatus`) - rust-lang#74294 (Update cross-compilation README) - rust-lang#74337 (Handle case of incomplete local ty more gracefully) - rust-lang#74344 (Remove string comparison and use diagnostic item instead) - rust-lang#74347 (Initialize default providers only once) - rust-lang#74353 (Edit docs for rustc_middle::dep_graph::dep_node) - rust-lang#74374 (Add a 1.45 release note on lto vs. embed-bitcode) Failed merges: - rust-lang#74251 (Teach bootstrap about target files vs target triples) r? @ghost

bors · 2020-07-16T06:46:33Z

☔ The latest upstream changes (presumably #74375) made this pull request unmergeable. Please resolve the merge conflicts.

`rustc` allows passing in predefined target triples as well as JSON target specification files. This change allows bootstrap to have the first inkling about those differences. This allows building a cross-compiler for an out-of-tree architecture (even though that compiler won't work for other reasons). Even if no one ever uses this functionality, I think the newtype around the `Interned<String>` improves the readability of the code.

shepmaster · 2020-07-17T14:09:41Z

Let's see what causes a conflict this time...

@bors r=@Mark-Simulacrum

bors · 2020-07-17T14:09:42Z

📌 Commit e2b337d has been approved by Mark-Simulacrum

…r=Mark-Simulacrum Teach bootstrap about target files vs target triples `rustc` allows passing in predefined target triples as well as JSON target specification files. This change allows bootstrap to have the first inkling about those differences. This allows building a cross-compiler for an out-of-tree architecture (even though that compiler won't work for other reasons). Even if no one ever uses this functionality, I think the newtype around the `Interned<String>` improves the readability of the code.

@ghost

…arth Rollup of 18 pull requests Successful merges: - rust-lang#71670 (Enforce even more the code blocks attributes check through rustdoc) - rust-lang#73930 (Make some Option methods const) - rust-lang#74009 (Fix MinGW `run-make-fulldeps` tests) - rust-lang#74056 (Add Arguments::as_str().) - rust-lang#74169 (Stop processing unreachable blocks when solving dataflow) - rust-lang#74251 (Teach bootstrap about target files vs target triples) - rust-lang#74288 (Fix src/test/run-make/static-pie/test-aslr.rs) - rust-lang#74300 (Use intra-doc links in core::iter module) - rust-lang#74364 (add lazy normalization regression tests) - rust-lang#74368 (Add CSS tidy check) - rust-lang#74394 (Remove leftover from emscripten fastcomp support) - rust-lang#74411 (Don't assign `()` to `!` MIR locals) - rust-lang#74416 (Use an UTF-8 locale for the linker.) - rust-lang#74424 (Move hir::Place to librustc_middle/hir) - rust-lang#74428 (docs: better demonstrate that None values are skipped as many times a…) - rust-lang#74438 (warn about uninitialized multi-variant enums) - rust-lang#74440 (Fix Arc::as_ptr docs) - rust-lang#74452 (intra-doc links: resolve modules in the type namespace) Failed merges: r? @ghost

rust-highfive assigned Mark-Simulacrum Jul 11, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 11, 2020

shepmaster force-pushed the bootstrap-target-files branch from 20c3ec1 to be61fa0 Compare July 11, 2020 19:16

shepmaster force-pushed the bootstrap-target-files branch 2 times, most recently from 90aff82 to 8abbbe2 Compare July 12, 2020 18:52

Mark-Simulacrum reviewed Jul 12, 2020

View reviewed changes

src/bootstrap/config.rs Outdated Show resolved Hide resolved

shepmaster force-pushed the bootstrap-target-files branch from 8abbbe2 to c24b96d Compare July 13, 2020 00:16

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 13, 2020

Manishearth mentioned this pull request Jul 13, 2020

Rollup of 18 pull requests #74303

Closed

Manishearth mentioned this pull request Jul 13, 2020

Rollup of 18 pull requests #74305

Closed

Manishearth mentioned this pull request Jul 13, 2020

Rollup of 17 pull requests #74306

Closed

Manishearth mentioned this pull request Jul 13, 2020

Rollup of 18 pull requests #74308

Closed

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 14, 2020

bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 14, 2020

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 15, 2020

Manishearth mentioned this pull request Jul 15, 2020

Rollup of 14 pull requests #74375

Merged

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 16, 2020

shepmaster force-pushed the bootstrap-target-files branch from c24b96d to e2b337d Compare July 17, 2020 14:08

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 17, 2020

Manishearth mentioned this pull request Jul 17, 2020

Rollup of 17 pull requests #74455

Closed

Manishearth mentioned this pull request Jul 17, 2020

Rollup of 18 pull requests #74461

Merged

bors merged commit 7d4e6c0 into rust-lang:master Jul 18, 2020

cuviper added this to the 1.47.0 milestone May 2, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Teach bootstrap about target files vs target triples #74251

Teach bootstrap about target files vs target triples #74251

shepmaster commented Jul 11, 2020

rust-highfive commented Jul 11, 2020

bors commented Jul 12, 2020

Mark-Simulacrum left a comment

shepmaster commented Jul 13, 2020

bors commented Jul 13, 2020

bors commented Jul 13, 2020

Manishearth commented Jul 14, 2020

eddyb commented Jul 14, 2020

shepmaster commented Jul 15, 2020

bors commented Jul 15, 2020

bors commented Jul 16, 2020

shepmaster commented Jul 17, 2020

bors commented Jul 17, 2020

Teach bootstrap about target files vs target triples #74251

Teach bootstrap about target files vs target triples #74251

Conversation

shepmaster commented Jul 11, 2020

rust-highfive commented Jul 11, 2020

bors commented Jul 12, 2020

Mark-Simulacrum left a comment

Choose a reason for hiding this comment

shepmaster commented Jul 13, 2020

bors commented Jul 13, 2020

bors commented Jul 13, 2020

Manishearth commented Jul 14, 2020

eddyb commented Jul 14, 2020

shepmaster commented Jul 15, 2020

bors commented Jul 15, 2020

bors commented Jul 16, 2020

shepmaster commented Jul 17, 2020

bors commented Jul 17, 2020