[go: nahoru, domu]

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

Update sys-info to v0.9 #16

Merged
merged 3 commits into from
Jun 13, 2021
Merged

Update sys-info to v0.9 #16

merged 3 commits into from
Jun 13, 2021

Conversation

Alovchin91
Copy link
Contributor
@Alovchin91 Alovchin91 commented May 17, 2021

This PR updates sys-info dependency to v0.9 which improves Windows support to be arch-independent and enables building rustup for Windows on ARM64: rust-lang/rustup#2612

This is a re-post of this PR: #14

Should also help with #15

@rbtcollins
Copy link
Owner

This is failing in the gcc windows build

@Alovchin91
Copy link
Contributor Author

Omg, is this serious? 🤦

warning: c/windows.c: In function 'get_cpu_speed':
warning: c/windows.c:71:2: error: 'for' loop initial declarations are only allowed in C99 or C11 mode
warning:   for (unsigned int i = 0; i < num; i++) {
warning:   ^
warning: c/windows.c:71:2: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code

@rbtcollins Is it okay if I'll try to upgrade the version of mingw used for the CI to at least 6.3.0?

@rbtcollins
Copy link
Owner
rbtcollins commented Jun 8, 2021 via email

@Alovchin91
Copy link
Contributor Author
Alovchin91 commented Jun 8, 2021

@rbtcollins Done! Seems to run on my fork. I've used the same mingw packages as rustup.

Copy link
Collaborator
@kinnison kinnison left a comment

Choose a reason for hiding this comment

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

This seems okay.

@kinnison kinnison self-requested a review June 13, 2021 11:26
Copy link
Collaborator
@kinnison kinnison left a comment

Choose a reason for hiding this comment

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

Actually I've just realied this is editing the workflow files directly rather than via the template, I'll fix that up.

kinnison and others added 2 commits June 13, 2021 12:31
Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>
@Alovchin91
Copy link
Contributor Author

Oh, sorry, I didn't realize there was a template 😬 Thanks for fixing this up!

@kinnison
Copy link
Collaborator

@Alovchin91 Yeah this is borrowed from Rustup's CI, each file does have a comment like:

# This is ci/actions-templates/windows-builds-template.yaml
# Do not edit this file in .github/workflows

at the top, but that's easy to miss :/

@kinnison kinnison merged commit c193087 into rbtcollins:master Jun 13, 2021
@Alovchin91 Alovchin91 deleted the alovchin91/update-sys-info branch June 14, 2021 11:17
@Alovchin91 Alovchin91 mentioned this pull request Jun 29, 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.

None yet

3 participants