Skip to content

Refactor scripts #46

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

Merged
merged 1 commit into from
Jul 7, 2021
Merged

Refactor scripts #46

merged 1 commit into from
Jul 7, 2021

Conversation

antoyo
Copy link
Contributor

@antoyo antoyo commented Jul 3, 2021

No description provided.

@antoyo
Copy link
Contributor Author

antoyo commented Jul 6, 2021

@dkm Will you need an option to disable building the sysroot?

@dkm
Copy link

dkm commented Jul 6, 2021

I think that if we have the binary option disabled in CE, we should skip building the sysroot for nothing. I haven't refreshed my script to use your refactored script yet, but when I do, being able to skip sysroot building would be nice, yes :)

When the issue with too-big binary is fixed, then we'll build sysroot again and this option will be useless.

@bjorn3
Copy link
Member

bjorn3 commented Jul 6, 2021

I think that if we have the binary option disabled in CE, we should skip building the sysroot for nothing.

The sysroot needs to be available even if the binary option is disabled. You need the crate metadata for at least libcore unless you want to manually define lang items like Sized, Add, ... It should be fine to use the cg_llvm built sysroot shipped with rustc though. cg_clif has the --sysroot llvm option for this. I recently rewrote most of cg_clif's build system in rust by the way for windows compatibility. Only the testing isn't rewritten yet. ./prepare.sh and ./build.sh and ./build/cargo.sh are now available as ./y.rs prepare, ./y.rs build and ./build/cargo. Feel free to copy the new build system for cg_gcc.

@dkm
Copy link

dkm commented Jul 7, 2021

I'm testing your new scripts. I'll simply use the build.sh script and remove few lines from mine.
Don't bother making the sysroot optional, I'll simply disable binary in compiler explorer until it is fixed and always use cg_gcc sysroot. Easier this way :)

@dkm
Copy link

dkm commented Jul 7, 2021

@antoyo as you are asking on another issue what's left before being able to push to CE: maybe this script? It's not a blocker as it's mostly a matter of removing few lines and having the same commands in build.sh, but it's cleaner this way. So if you merge this (or at least build.sh) I can finalize all 3 PRs and ask for reviews.

@antoyo
Copy link
Contributor Author

antoyo commented Jul 7, 2021

Ok, tell me when you're done reviewing this PR and I'll merge it!

@antoyo antoyo merged commit 26f08f5 into master Jul 7, 2021
@antoyo antoyo deleted the refactor-scripts branch July 7, 2021 22:06
antoyo added a commit that referenced this pull request Jul 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants