OpenE2K
/
libc-rs
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #1111 - gnzlbg:xcode10, r=alexcrichton 

update osx builds to xcode10
This commit is contained in:
bors 2018-10-29 22:15:31 +00:00
parent 1eb08ed1b4 4182efd167
commit 4a8304d47e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -38,10 +38,10 @@ matrix:
- env: TARGET=i686-unknown-linux-gnu
- os: osx
env: TARGET=x86_64-apple-darwin NO_ADD=1
osx_image: xcode9.4
osx_image: xcode10
- os: osx
env: TARGET=i686-apple-darwin
osx_image: xcode9.4
osx_image: xcode10
- env: TARGET=arm-linux-androideabi
- env: TARGET=aarch64-linux-android
# FIXME(#826) should reenable
@ -73,7 +73,7 @@ matrix:
rust: beta
- os: osx
env: TARGET=x86_64-apple-darwin NO_ADD=1
osx_image: xcode9.4
osx_image: xcode10
rust: beta
# nightly
@ -81,7 +81,7 @@ matrix:
rust: nightly
- os: osx
env: TARGET=x86_64-apple-darwin NO_ADD=1
osx_image: xcode9.4
osx_image: xcode10
rust: nightly
# not available on stable
# without --release the build fails

4
src/unix/bsd/apple/mod.rs
View File

@ -785,8 +785,8 @@ pub const VM_FLAGS_SUPERPAGE_MASK: ::c_int = 0x70000;
pub const VM_FLAGS_RETURN_DATA_ADDR: ::c_int = 0x100000;
pub const VM_FLAGS_RETURN_4K_DATA_ADDR: ::c_int = 0x800000;
pub const VM_FLAGS_ALIAS_MASK: ::c_int = 0xFF000000;
pub const VM_FLAGS_USER_ALLOCATE: ::c_int = 0xff07401b;
pub const VM_FLAGS_USER_MAP: ::c_int = 0xff97401b;
pub const VM_FLAGS_USER_ALLOCATE: ::c_int = 0xff07401f;
pub const VM_FLAGS_USER_MAP: ::c_int = 0xff97401f;
pub const VM_FLAGS_USER_REMAP: ::c_int = VM_FLAGS_FIXED | VM_FLAGS_ANYWHERE |
VM_FLAGS_RANDOM_ADDR |
VM_FLAGS_OVERWRITE |