Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- remove /usr/include from the include path since the iOS SDK provides the correct version - `_NSGetEnviron()` is private and not available on iOS - `.align` without an argument is not allowed with the Apple tools. 2^2 should be the default alignment - ignore error messages for XCode < 5 - pass include path to libuv
- Loading branch information
kud1ing
committed
Nov 6, 2013
1 parent
3a15482
commit 2a333ed
Showing
5 changed files
with
26 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2a333ed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from alexcrichton
at https://github.com/kud1ing/rust/commit/2a333ed0884c65d06591607e6e9b2857bd327d6e
2a333ed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging kud1ing/rust/ios = 2a333ed into auto
2a333ed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
kud1ing/rust/ios = 2a333ed merged ok, testing candidate = 22eb11c
2a333ed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/2351
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/197
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/197
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/2355
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/1461
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/1460
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/2369
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/1461
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/1461
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/2370
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/1461
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/1461
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/1537
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/2355
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/1459
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/1461
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/2133
2a333ed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fast-forwarding master to auto = 22eb11c