Skip to content

Commit 4a8304d

Browse files
committed
Auto merge of #1111 - gnzlbg:xcode10, r=alexcrichton
update osx builds to xcode10
2 parents 1eb08ed + 4182efd commit 4a8304d

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ matrix:
3838
- env: TARGET=i686-unknown-linux-gnu
3939
- os: osx
4040
env: TARGET=x86_64-apple-darwin NO_ADD=1
41-
osx_image: xcode9.4
41+
osx_image: xcode10
4242
- os: osx
4343
env: TARGET=i686-apple-darwin
44-
osx_image: xcode9.4
44+
osx_image: xcode10
4545
- env: TARGET=arm-linux-androideabi
4646
- env: TARGET=aarch64-linux-android
4747
# FIXME(#826) should reenable
@@ -73,15 +73,15 @@ matrix:
7373
rust: beta
7474
- os: osx
7575
env: TARGET=x86_64-apple-darwin NO_ADD=1
76-
osx_image: xcode9.4
76+
osx_image: xcode10
7777
rust: beta
7878

7979
# nightly
8080
- env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
8181
rust: nightly
8282
- os: osx
8383
env: TARGET=x86_64-apple-darwin NO_ADD=1
84-
osx_image: xcode9.4
84+
osx_image: xcode10
8585
rust: nightly
8686
# not available on stable
8787
# without --release the build fails

src/unix/bsd/apple/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -785,8 +785,8 @@ pub const VM_FLAGS_SUPERPAGE_MASK: ::c_int = 0x70000;
785785
pub const VM_FLAGS_RETURN_DATA_ADDR: ::c_int = 0x100000;
786786
pub const VM_FLAGS_RETURN_4K_DATA_ADDR: ::c_int = 0x800000;
787787
pub const VM_FLAGS_ALIAS_MASK: ::c_int = 0xFF000000;
788-
pub const VM_FLAGS_USER_ALLOCATE: ::c_int = 0xff07401b;
789-
pub const VM_FLAGS_USER_MAP: ::c_int = 0xff97401b;
788+
pub const VM_FLAGS_USER_ALLOCATE: ::c_int = 0xff07401f;
789+
pub const VM_FLAGS_USER_MAP: ::c_int = 0xff97401f;
790790
pub const VM_FLAGS_USER_REMAP: ::c_int = VM_FLAGS_FIXED | VM_FLAGS_ANYWHERE |
791791
VM_FLAGS_RANDOM_ADDR |
792792
VM_FLAGS_OVERWRITE |

0 commit comments

Comments
 (0)