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

Support cross-compiling for iOS (armv7) #14715

Merged
merged 10 commits into from
Jun 16, 2014
Merged

Support cross-compiling for iOS (armv7) #14715

merged 10 commits into from
Jun 16, 2014

Conversation

vhbit
Copy link
Contributor

@vhbit vhbit commented Jun 7, 2014

No description provided.

@sfackler
Copy link
Member

sfackler commented Jun 7, 2014

There's a tidy issue: https://travis-ci.org/mozilla/rust/jobs/27001033

@vhbit
Copy link
Contributor Author

vhbit commented Jun 9, 2014

@sfackler fixed

@vhbit vhbit closed this Jun 9, 2014
@vhbit vhbit reopened this Jun 9, 2014
CC_arm-apple-ios = $(shell xcrun -find -sdk iphoneos clang)
CXX_arm-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
CPP_arm-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
AR_arm-apple-ios = $(shell xcrun -find -sdk iphoneos ar)
Copy link
Member

Choose a reason for hiding this comment

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

The current invocations of xcrun are guarded with ifeq ($(CFG_OSTYPE),apple-darwin), could you add those around these to make sure we're not running xcrun when it doesn't exist?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will do

@alexcrichton
Copy link
Member

This looks pretty awesome, thank you for this!

@vhbit
Copy link
Contributor Author

vhbit commented Jun 9, 2014

@alexcrichton
Regarding comments - will do
Regarding dylibs constants - it seems iOS8 will bring them into iOS world, but I haven't yet checked all the details.

OsAndroid => ".note.rustc",
OsFreebsd => ".note.rustc"
abi::OsMacos => "__note.rustc",
abi::OsiOS => "__note.rustc",
Copy link
Member

Choose a reason for hiding this comment

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

As above, I think this could possibly just be fail!()

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This one works, i.e. it seems meta_section_name is always called from trans::base::write_metadata, but read_meta_section_name isn't in case of iOS

@alexcrichton
Copy link
Member

Just a few minor things, but otherwise looks good to me! Don't worry about the travis failure, it's a known problem.

@vhbit
Copy link
Contributor Author

vhbit commented Jun 13, 2014

Great. Regarding Travis - there is also linking error in log just before timeout, so it seems requires a little attention anyway, may be updated jemalloc requires some additional configure parameters.

@vhbit
Copy link
Contributor Author

vhbit commented Jun 13, 2014

Was unable to reproduce Travis fail - builds and checks everything fine on Linux

@vhbit
Copy link
Contributor Author

vhbit commented Jun 13, 2014

It's pretty ironic that build fails because of broken support of Android in updated compiler-rt

Previous update unfortunately included changes which
broke Android compilation. This update fixes it and
should allow correct compilation of SjLj for iOS and
all builtins for Android.
@vhbit
Copy link
Contributor Author

vhbit commented Jun 14, 2014

Does it needs a new approval now?

It seems in one of rebases I’ve resolved conflicts wrong and left one redundant line, it is absent in current master and it might cause compilation failure by copying file into itself.
@vhbit
Copy link
Contributor Author

vhbit commented Jun 16, 2014

@alexcrichton It seems I've found reason of win32 build failure, need one more approval.

@bors bors closed this Jun 16, 2014
@bors bors merged commit 2ec323e into rust-lang:master Jun 16, 2014
@vhbit vhbit deleted the ios-pr2 branch June 27, 2014 17:58
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 5, 2023
Refactor symbol index

Closes rust-lang/rust-analyzer#14677

instead of eagerly fetching the source data in symbol index we do it lazily now, this shouldn't make it much more expensive as we had to parse the source most of the time anyways even after fetching.
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