Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

unwind: make build.rs do clean rebuilds #87977

Closed

Conversation

gburgessiv
Copy link
Contributor

If the build by this was interrupted or otherwise left incomplete, there
could be object files hanging around, which triggers an assertion later.
Since we unconditionally rebuild everything here anyway, start with a
clean slate each build.

r? @Mark-Simulacrum

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 12, 2021
@Mark-Simulacrum Mark-Simulacrum 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-review Status: Awaiting review from the assignee but also interested parties. labels Aug 19, 2021
@gburgessiv gburgessiv force-pushed the unwind-clean-rebuilds branch from 11e54d0 to 44f1f1a Compare August 24, 2021 19:36
Copy link
Contributor Author

@gburgessiv gburgessiv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the feedback!

library/unwind/build.rs Show resolved Hide resolved
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 24, 2021

📌 Commit 44f1f1a36f24cea2a3135768f213f45ad3f23055 has been approved by Mark-Simulacrum

@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 Aug 24, 2021
@rust-log-analyzer

This comment has been minimized.

If the build by this was interrupted or otherwise left incomplete, there
could be object files hanging around, which triggers an assertion later.
Since we unconditionally rebuild everything here anyway, start with a
clean slate each build.
@gburgessiv gburgessiv force-pushed the unwind-clean-rebuilds branch from 44f1f1a to 90950a1 Compare August 24, 2021 23:10
@gburgessiv
Copy link
Contributor Author

TIL my cargo fmt config doesn't mesh with this repo's. Ran ./x.py fmt to try to fix the things -- ./x.py test no longer complains about formatting issues :)

@bors
Copy link
Contributor

bors commented Aug 28, 2021

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

@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 Aug 28, 2021
@gburgessiv
Copy link
Contributor Author

Looks like the changes that caused the merge conflict also added a check to tell objects generated from C++ sources apart from objects generated from C sources. Hence, this should be fixed already, so I'll close it out. Thanks again for the review! :)

@gburgessiv gburgessiv closed this Aug 31, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants