Skip to content

Rebase onto apple/swift master #12

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

Conversation

modocache
Copy link
Member

Like #11, but instead of merging master, this is rebased on top of it.

@zhuowei: I'm in the process of testing this rebase. If I can confirm that swiftc-android hello.swift && swift-android-push hello work, would you mind if I force-pushed this to SwiftAndroid master?

@modocache modocache force-pushed the swiftanrdoid-master-rebase branch 2 times, most recently from 603e38d to 06eff68 Compare January 12, 2016 00:26
@modocache
Copy link
Member Author

I've confirmed that this works. @zhuowei, mind if I force-push to master, or would you like to test on your end as well?

@modocache modocache force-pushed the swiftanrdoid-master-rebase branch from 06eff68 to ea62f3c Compare January 12, 2016 19:22
@modocache modocache changed the title Rebase onto apple/swift master (8ccf0e4) Rebase onto apple/swift master Jan 12, 2016
@modocache
Copy link
Member Author

Rebased onto f82389a.

…compile job pools from LLVM's cmake list, force -j1 and split dwarfs when compiling
…m compiler_rt, hardcode path to libicu for now
….ld for Android target

Hello world works now!
… Swift default linker flags, attempt at copying libicu libraries automatically (doesn't work)
the dynamic linker doesn't understand them and spams warnings.
@modocache modocache force-pushed the swiftanrdoid-master-rebase branch from ea62f3c to f88771a Compare January 13, 2016 21:26
@zhuowei
Copy link
Member

zhuowei commented Jan 13, 2016

if it can produce a working executable, then of course you can force-push

@modocache
Copy link
Member Author

@zhuowei Excellent! I'll do so in the next few hours.

@modocache modocache closed this Jan 14, 2016
@modocache modocache deleted the swiftanrdoid-master-rebase branch January 14, 2016 05:34
@modocache
Copy link
Member Author

Done! Be sure to pull before doing any more work.

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