Skip to content

ppc64le custom presets. #16883

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

Closed
wants to merge 4 commits into from
Closed

ppc64le custom presets. #16883

wants to merge 4 commits into from

Conversation

asowani
Copy link
Contributor

@asowani asowani commented May 29, 2018

Contains custom build presets for ppc64le.

@asowani
Copy link
Contributor Author

asowani commented Jul 20, 2018

The build presets contained in this PR are required for building 4.2-branch on ppc64le CI. Can those be cherry-picked? Relevant discussion is at #16884

@airspeedswift
Copy link
Member

Hi @asowani – sorry for the confusion. Let's get this PR reviewed, tested and landed on master (looks like some conflicts need resolving). Once that's done we can talk about whether it should be taken into the 4.2 branch, but please hold off on raising 4.2 PRs until after things are merged to master in general.

@asowani
Copy link
Contributor Author

asowani commented Aug 3, 2018

I have modified test/IRGen/clang_iniline_opt.swift to resolve the conflict. "-enable-objc-interop" got added to master after my PR, hence the conflict. Is it possible to merge this PR now? Thanks!

@shahmishal
Copy link
Member

@asowani can you resolve the conflict?

<<<<<<< master
// UNSUPPORTED: CPU=powerpc64le
=======
>>>>>>> master

@shahmishal
Copy link
Member

@swift-ci test

@swift-ci
Copy link
Contributor

swift-ci commented Sep 7, 2018

Build failed
Swift Test Linux Platform
Git Sha - 086837e

@swift-ci
Copy link
Contributor

swift-ci commented Sep 7, 2018

Build failed
Swift Test OS X Platform
Git Sha - 086837e

@CodaFi
Copy link
Contributor

CodaFi commented Nov 18, 2019

Rebased this. Going to merge it in #28328

@CodaFi CodaFi closed this Nov 18, 2019
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