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

Lokathor tries to use the .gitmodules #313

Merged
merged 5 commits into from
Sep 10, 2019
Merged

Lokathor tries to use the .gitmodules #313

merged 5 commits into from
Sep 10, 2019

Conversation

Lokathor
Copy link
Contributor

@Lokathor Lokathor commented Sep 6, 2019

@alexcrichton requested that I try to make a PR for this crate that points at the new libm PR before we land the libm PR.

I don't know if it's set right, but CI will tell.

@alexcrichton
Copy link
Member

One thing this will want to do is to ensure that the unstable feature is "activated" for libm, probably by printing a rustc-cfg annotation in the build script.

build.rs Outdated Show resolved Hide resolved
@alexcrichton
Copy link
Member

@Lokathor ok want to revert the update to .gitmodules, update the libm hash to one that's upstream, and I can merge?

@Lokathor
Copy link
Contributor Author

Lokathor commented Sep 9, 2019

Yes, I will try to do that within a few hours.

@Lokathor
Copy link
Contributor Author

Lokathor commented Sep 9, 2019

Uh, I tried to do the reverse of what I did before and then it suddenly said there was a 400+ commit difference and it refused to merge.

@Lokathor
Copy link
Contributor Author

I think that it's fixed, and if CI passes feel free to merge.

@alexcrichton alexcrichton merged commit 0387545 into rust-lang:master Sep 10, 2019
@alexcrichton
Copy link
Member

👍

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.

2 participants