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

mk: Fix compile with makefiles #38506

Merged
merged 1 commit into from
Dec 21, 2016
Merged

Conversation

alexcrichton
Copy link
Member

A tweak was made to dependencies in #38451 but the makefiles weren't updated to
accompany this. Instead of trying to integerate the build_helper crate into
the makefiles (which currently isn't present) this commit takes the approach of
just duplicating the required logic, which should be small enough for now.

A tweak was made to dependencies in rust-lang#38451 but the makefiles weren't updated to
accompany this. Instead of trying to integerate the `build_helper` crate into
the makefiles (which currently isn't present) this commit takes the approach of
just duplicating the required logic, which should be small enough for now.
@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@brson
Copy link
Contributor

brson commented Dec 21, 2016

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Dec 21, 2016

📌 Commit 839b696 has been approved by brson

@bors
Copy link
Contributor

bors commented Dec 21, 2016

⌛ Testing commit 839b696 with merge 92d4600...

bors added a commit that referenced this pull request Dec 21, 2016
mk: Fix compile with makefiles

A tweak was made to dependencies in #38451 but the makefiles weren't updated to
accompany this. Instead of trying to integerate the `build_helper` crate into
the makefiles (which currently isn't present) this commit takes the approach of
just duplicating the required logic, which should be small enough for now.
@bors bors merged commit 839b696 into rust-lang:master Dec 21, 2016
@alexcrichton alexcrichton deleted the fix-makefiles branch December 27, 2016 06:15
@brson brson added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 19, 2017
@brson
Copy link
Contributor

brson commented Jan 19, 2017

@alexcrichton alexcrichton added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jan 19, 2017
@brson brson mentioned this pull request Jan 19, 2017
@alexcrichton alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 19, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants