Skip to content

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Dec 22, 2022

  • Don't pass llvm-specific args when using cranelift
  • Don't use asm in compiler_builtins when using cranelift

r? @bjorn3 cc @Mark-Simulacrum

@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 22, 2022
@rust-log-analyzer

This comment has been minimized.

@bjorn3
Copy link
Member

bjorn3 commented Dec 22, 2022

@bors r+

@bors
Copy link
Collaborator

bors commented Dec 22, 2022

📌 Commit 82dde57b2acee5781da1f37ee646af651cb04aab has been approved by bjorn3

It is now in the queue for this repository.

@bors 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 Dec 22, 2022
@jyn514
Copy link
Member Author

jyn514 commented Dec 22, 2022

@bors r-

Missed a spot, sorry

Building stage1 std artifacts (x86_64-pc-windows-msvc -> x86_64-pc-windows-msvc)
error: Package `test v0.0.0 (C:\Users\Joshua Nelson\src\rust2\library\test)` does not have the feature `compiler-builtins-no-asmpanic-unwind`
Build completed unsuccessfully in 0:00:12

@bors 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 Dec 22, 2022
- Don't pass llvm-specific args when using cranelift
- Don't use `asm` in compiler_builtins when using cranelift
@jyn514
Copy link
Member Author

jyn514 commented Dec 22, 2022

@bors r=bjorn3

@bors
Copy link
Collaborator

bors commented Dec 22, 2022

📌 Commit 0b3ffcb has been approved by bjorn3

It is now in the queue for this repository.

@bors 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 Dec 22, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 23, 2022
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#105978 (Mark `proc_macro_decls_static` as always used)
 - rust-lang#106051 (Allow building std with cranelift)
 - rust-lang#106056 (Make `sess.bug` much less noisy)
 - rust-lang#106057 (Give a more helpful error for "trimmed_def_paths constructed")
 - rust-lang#106058 (Fix the issue number in comment for as_local_call_operand)
 - rust-lang#106059 (Avoid running the `Profile` step twice on `x setup`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 49287a4 into rust-lang:master Dec 23, 2022
@rustbot rustbot added this to the 1.68.0 milestone Dec 23, 2022
@jyn514 jyn514 deleted the cranelift-std branch February 25, 2023 18:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants