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

Delete more swaths of the configure script #39770

Merged
merged 7 commits into from
Mar 12, 2017

Conversation

alexcrichton
Copy link
Member

This PR deletes more swaths of the ./configure script which are either no longer necessary or already available in rustbuild (where an implementation is preferred)

@rust-highfive
Copy link
Collaborator

r? @brson

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

@bors
Copy link
Contributor

bors commented Feb 25, 2017

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

elif cputype == 's390x':
cputype = 's390x'
elif cputype == 'BePC':
cputype = 'i686'
Copy link
Contributor

Choose a reason for hiding this comment

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

'BePC' really? where did this come from?

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh I run Haiku at home and Rust won't bootstrap otherwise.

@brson
Copy link
Contributor

brson commented Mar 9, 2017

@bors r+

@bors
Copy link
Contributor

bors commented Mar 9, 2017

📌 Commit bfd2f5b has been approved by brson

@bors
Copy link
Contributor

bors commented Mar 10, 2017

🔒 Merge conflict

@alexcrichton
Copy link
Member Author

@bors: retry

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Mar 10, 2017
Delete more swaths of the configure script

This PR deletes more swaths of the `./configure` script which are either no longer necessary or already available in rustbuild (where an implementation is preferred)
@alexcrichton
Copy link
Member Author

@bors: r=brson

@bors
Copy link
Contributor

bors commented Mar 10, 2017

📌 Commit cd23f1c has been approved by brson

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Mar 10, 2017
Delete more swaths of the configure script

This PR deletes more swaths of the `./configure` script which are either no longer necessary or already available in rustbuild (where an implementation is preferred)
@alexcrichton
Copy link
Member Author

@bors: r=brson

@bors
Copy link
Contributor

bors commented Mar 10, 2017

📌 Commit 3acaf21 has been approved by brson

@alexcrichton
Copy link
Member Author

@bors: r=brson

@bors
Copy link
Contributor

bors commented Mar 10, 2017

📌 Commit ade8f29 has been approved by brson

@bors
Copy link
Contributor

bors commented Mar 11, 2017

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

This is all in rustbuild already.
This is all not used any more
All of these should be handled by rustbuild in sanity.rs right now.
All of this should already be vendored in rustbuild if necessary or otherwise
it's just not used.
None of this is used by rustbuild any more
This commit removes detection of CFG_OSTYPE and CFG_CPUTYPE from the configure
script, which means that the default value of `--build` is no longer present in
the configure script. All this logic is now available in rustbuild itself, so
there's no need to duplicate it.
@alexcrichton
Copy link
Member Author

@bors: r=brson

@bors
Copy link
Contributor

bors commented Mar 11, 2017

📌 Commit f8ca805 has been approved by brson

@bors
Copy link
Contributor

bors commented Mar 11, 2017

⌛ Testing commit f8ca805 with merge 244c45b...

@bors
Copy link
Contributor

bors commented Mar 11, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member Author

alexcrichton commented Mar 11, 2017 via email

@bors
Copy link
Contributor

bors commented Mar 12, 2017

⌛ Testing commit f8ca805 with merge d9cf601...

bors added a commit that referenced this pull request Mar 12, 2017
Delete more swaths of the configure script

This PR deletes more swaths of the `./configure` script which are either no longer necessary or already available in rustbuild (where an implementation is preferred)
@bors
Copy link
Contributor

bors commented Mar 12, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: brson
Pushing d9cf601 to master...

@bors bors merged commit f8ca805 into rust-lang:master Mar 12, 2017
@bors bors mentioned this pull request Mar 12, 2017
cputype = 'arm'
ostype += 'eabihf'
elif cputype == 'armv7l':
Copy link
Member

Choose a reason for hiding this comment

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

This cputype is also in the list at new line 472

@alexcrichton alexcrichton deleted the configure-clean branch March 15, 2017 14:42
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.

5 participants