Skip to content

Commit 8a7b02c

Browse files
JohnTitorJohnTitor
authored
Merge pull request #1647 from vickenty/osx
Fix CI
2 parents 74ff412 + 40f80c6 commit 8a7b02c

File tree

19 files changed

+187
-176
lines changed

19 files changed

+187
-176
lines changed

‎.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ task:
1515
task:
1616
name: stable x86_64-unknown-freebsd-11
1717
freebsd_instance:
18-
image: freebsd-11-3-stable-amd64-v20190801
18+
image: freebsd-11-3-stable-amd64-v20200213
1919
setup_script:
2020
- pkg install -y curl
2121
- curl https://sh.rustup.rs -sSf --output rustup.sh

‎ci/azure-install-rust.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ steps:
4545
- bash: |
4646
set -ex
4747
gcc -print-search-dirs
48-
find "C:\ProgramData\Chocolatey" -name "crt2*"
49-
find "C:\ProgramData\Chocolatey" -name "dllcrt2*"
50-
find "C:\ProgramData\Chocolatey" -name "libmsvcrt*"
48+
/usr/bin/find "C:\ProgramData\Chocolatey" -name "crt2*"
49+
/usr/bin/find "C:\ProgramData\Chocolatey" -name "dllcrt2*"
50+
/usr/bin/find "C:\ProgramData\Chocolatey" -name "libmsvcrt*"
5151
condition: eq( variables['Agent.OS'], 'Windows_NT' )
5252
displayName: Find GCC libraries (windows)
5353
- bash: |

‎ci/azure.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -99,18 +99,6 @@ jobs:
9999
x86_64-apple-darwin:
100100
TARGET: x86_64-apple-darwin
101101

102-
- job: DockerOSX32
103-
pool:
104-
vmImage: macos-10.13
105-
steps:
106-
- template: azure-install-rust.yml
107-
- bash: LIBC_CI=1 sh ./ci/run.sh $TARGET
108-
displayName: Execute run.sh
109-
strategy:
110-
matrix:
111-
i686-apple-darwin:
112-
TARGET: i686-apple-darwin
113-
114102
- job: Windows
115103
pool:
116104
vmImage: vs2017-win2016

‎ci/build.sh

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,15 @@ x86_64-unknown-linux-gnux32 \
147147

148148
RUST_OSX_TARGETS="\
149149
aarch64-apple-ios \
150+
x86_64-apple-darwin \
151+
x86_64-apple-ios \
152+
"
153+
154+
RUST_LT_1_42_OSX_TARGETS="\
150155
armv7-apple-ios \
151156
armv7s-apple-ios \
152157
i386-apple-ios \
153158
i686-apple-darwin \
154-
x86_64-apple-darwin \
155-
x86_64-apple-ios \
156159
"
157160

158161
# The targets are listed here alphabetically
@@ -178,6 +181,12 @@ case "${OS}" in
178181
;;
179182
osx*)
180183
TARGETS="${RUST_OSX_TARGETS}"
184+
185+
if [ "${RUST}" != "nightly" ]; then
186+
if [ "${RUST}" != "beta" ]; then
187+
TARGETS="${TARGETS} ${RUST_LT_1_42_OSX_TARGETS}"
188+
fi
189+
fi
181190
;;
182191
*)
183192
;;
@@ -270,3 +279,17 @@ if [ "${RUST}" = "nightly" ] && [ "${OS}" = "linux" ]; then
270279
cargo xbuild --target switch.json
271280
fi
272281

282+
RUST_OSX_NO_CORE_TARGETS="\
283+
armv7-apple-ios \
284+
armv7s-apple-ios \
285+
i386-apple-ios \
286+
i686-apple-darwin \
287+
"
288+
289+
if [ "${RUST}" = "nightly" ] && [ "${OS}" = "osx" ]; then
290+
for TARGET in $RUST_OSX_NO_CORE_TARGETS; do
291+
if echo "$TARGET" | grep -q "$FILTER"; then
292+
test_target xbuild "$TARGET" 1
293+
fi
294+
done
295+
fi

‎libc-test/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ fn test_openbsd(target: &str) {
389389

390390
cfg.skip_field_type(move |struct_, field| {
391391
// type siginfo_t.si_addr changed from OpenBSD 6.0 to 6.1
392-
(struct_ == "siginfo_t" && field == "si_addr")
392+
struct_ == "siginfo_t" && field == "si_addr"
393393
});
394394

395395
cfg.generate("../src/lib.rs", "main.rs");

‎src/fuchsia/mod.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1509,12 +1509,12 @@ pub const LC_COLLATE: ::c_int = 3;
15091509
pub const LC_MONETARY: ::c_int = 4;
15101510
pub const LC_MESSAGES: ::c_int = 5;
15111511
pub const LC_ALL: ::c_int = 6;
1512-
pub const LC_CTYPE_MASK: ::c_int = (1 << LC_CTYPE);
1513-
pub const LC_NUMERIC_MASK: ::c_int = (1 << LC_NUMERIC);
1514-
pub const LC_TIME_MASK: ::c_int = (1 << LC_TIME);
1515-
pub const LC_COLLATE_MASK: ::c_int = (1 << LC_COLLATE);
1516-
pub const LC_MONETARY_MASK: ::c_int = (1 << LC_MONETARY);
1517-
pub const LC_MESSAGES_MASK: ::c_int = (1 << LC_MESSAGES);
1512+
pub const LC_CTYPE_MASK: ::c_int = 1 << LC_CTYPE;
1513+
pub const LC_NUMERIC_MASK: ::c_int = 1 << LC_NUMERIC;
1514+
pub const LC_TIME_MASK: ::c_int = 1 << LC_TIME;
1515+
pub const LC_COLLATE_MASK: ::c_int = 1 << LC_COLLATE;
1516+
pub const LC_MONETARY_MASK: ::c_int = 1 << LC_MONETARY;
1517+
pub const LC_MESSAGES_MASK: ::c_int = 1 << LC_MESSAGES;
15181518
// LC_ALL_MASK defined per platform
15191519

15201520
pub const MAP_FILE: ::c_int = 0x0000;
@@ -2691,7 +2691,7 @@ pub const FOPEN_MAX: ::c_uint = 1000;
26912691
pub const O_PATH: ::c_int = 0x00400000;
26922692
pub const O_EXEC: ::c_int = O_PATH;
26932693
pub const O_SEARCH: ::c_int = O_PATH;
2694-
pub const O_ACCMODE: ::c_int = (03 | O_SEARCH);
2694+
pub const O_ACCMODE: ::c_int = 03 | O_SEARCH;
26952695
pub const O_NDELAY: ::c_int = O_NONBLOCK;
26962696
pub const NI_MAXHOST: ::socklen_t = 255;
26972697
pub const PTHREAD_STACK_MIN: ::size_t = 2048;
@@ -2893,7 +2893,7 @@ pub const O_CREAT: ::c_int = 0x00010000;
28932893
pub const O_EXCL: ::c_int = 0x00020000;
28942894
pub const O_NOCTTY: ::c_int = 0x00000200;
28952895
pub const O_NONBLOCK: ::c_int = 0x00000010;
2896-
pub const O_SYNC: ::c_int = (0x00000040 | O_DSYNC);
2896+
pub const O_SYNC: ::c_int = 0x00000040 | O_DSYNC;
28972897
pub const O_RSYNC: ::c_int = O_SYNC;
28982898
pub const O_DSYNC: ::c_int = 0x00000020;
28992899

‎src/unix/bsd/apple/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,12 +1239,12 @@ pub const ACCOUNTING: ::c_short = 9;
12391239
pub const SIGNATURE: ::c_short = 10;
12401240
pub const SHUTDOWN_TIME: ::c_short = 11;
12411241

1242-
pub const LC_COLLATE_MASK: ::c_int = (1 << 0);
1243-
pub const LC_CTYPE_MASK: ::c_int = (1 << 1);
1244-
pub const LC_MESSAGES_MASK: ::c_int = (1 << 2);
1245-
pub const LC_MONETARY_MASK: ::c_int = (1 << 3);
1246-
pub const LC_NUMERIC_MASK: ::c_int = (1 << 4);
1247-
pub const LC_TIME_MASK: ::c_int = (1 << 5);
1242+
pub const LC_COLLATE_MASK: ::c_int = 1 << 0;
1243+
pub const LC_CTYPE_MASK: ::c_int = 1 << 1;
1244+
pub const LC_MESSAGES_MASK: ::c_int = 1 << 2;
1245+
pub const LC_MONETARY_MASK: ::c_int = 1 << 3;
1246+
pub const LC_NUMERIC_MASK: ::c_int = 1 << 4;
1247+
pub const LC_TIME_MASK: ::c_int = 1 << 5;
12481248
pub const LC_ALL_MASK: ::c_int = LC_COLLATE_MASK
12491249
| LC_CTYPE_MASK
12501250
| LC_MESSAGES_MASK

‎src/unix/bsd/freebsdlike/dragonfly/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -956,12 +956,12 @@ pub const UTX_DB_UTMPX: ::c_uint = 0;
956956
pub const UTX_DB_WTMPX: ::c_uint = 1;
957957
pub const UTX_DB_LASTLOG: ::c_uint = 2;
958958

959-
pub const LC_COLLATE_MASK: ::c_int = (1 << 0);
960-
pub const LC_CTYPE_MASK: ::c_int = (1 << 1);
961-
pub const LC_MONETARY_MASK: ::c_int = (1 << 2);
962-
pub const LC_NUMERIC_MASK: ::c_int = (1 << 3);
963-
pub const LC_TIME_MASK: ::c_int = (1 << 4);
964-
pub const LC_MESSAGES_MASK: ::c_int = (1 << 5);
959+
pub const LC_COLLATE_MASK: ::c_int = 1 << 0;
960+
pub const LC_CTYPE_MASK: ::c_int = 1 << 1;
961+
pub const LC_MONETARY_MASK: ::c_int = 1 << 2;
962+
pub const LC_NUMERIC_MASK: ::c_int = 1 << 3;
963+
pub const LC_TIME_MASK: ::c_int = 1 << 4;
964+
pub const LC_MESSAGES_MASK: ::c_int = 1 << 5;
965965
pub const LC_ALL_MASK: ::c_int = LC_COLLATE_MASK
966966
| LC_CTYPE_MASK
967967
| LC_MESSAGES_MASK

‎src/unix/bsd/freebsdlike/freebsd/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,12 +1024,12 @@ pub const UTXDB_ACTIVE: ::c_int = 0;
10241024
pub const UTXDB_LASTLOGIN: ::c_int = 1;
10251025
pub const UTXDB_LOG: ::c_int = 2;
10261026

1027-
pub const LC_COLLATE_MASK: ::c_int = (1 << 0);
1028-
pub const LC_CTYPE_MASK: ::c_int = (1 << 1);
1029-
pub const LC_MONETARY_MASK: ::c_int = (1 << 2);
1030-
pub const LC_NUMERIC_MASK: ::c_int = (1 << 3);
1031-
pub const LC_TIME_MASK: ::c_int = (1 << 4);
1032-
pub const LC_MESSAGES_MASK: ::c_int = (1 << 5);
1027+
pub const LC_COLLATE_MASK: ::c_int = 1 << 0;
1028+
pub const LC_CTYPE_MASK: ::c_int = 1 << 1;
1029+
pub const LC_MONETARY_MASK: ::c_int = 1 << 2;
1030+
pub const LC_NUMERIC_MASK: ::c_int = 1 << 3;
1031+
pub const LC_TIME_MASK: ::c_int = 1 << 4;
1032+
pub const LC_MESSAGES_MASK: ::c_int = 1 << 5;
10331033
pub const LC_ALL_MASK: ::c_int = LC_COLLATE_MASK
10341034
| LC_CTYPE_MASK
10351035
| LC_MESSAGES_MASK

‎src/unix/bsd/netbsdlike/netbsd/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -865,12 +865,12 @@ pub const AT_REMOVEDIR: ::c_int = 0x800;
865865
pub const EXTATTR_NAMESPACE_USER: ::c_int = 1;
866866
pub const EXTATTR_NAMESPACE_SYSTEM: ::c_int = 2;
867867

868-
pub const LC_COLLATE_MASK: ::c_int = (1 << ::LC_COLLATE);
869-
pub const LC_CTYPE_MASK: ::c_int = (1 << ::LC_CTYPE);
870-
pub const LC_MONETARY_MASK: ::c_int = (1 << ::LC_MONETARY);
871-
pub const LC_NUMERIC_MASK: ::c_int = (1 << ::LC_NUMERIC);
872-
pub const LC_TIME_MASK: ::c_int = (1 << ::LC_TIME);
873-
pub const LC_MESSAGES_MASK: ::c_int = (1 << ::LC_MESSAGES);
868+
pub const LC_COLLATE_MASK: ::c_int = 1 << ::LC_COLLATE;
869+
pub const LC_CTYPE_MASK: ::c_int = 1 << ::LC_CTYPE;
870+
pub const LC_MONETARY_MASK: ::c_int = 1 << ::LC_MONETARY;
871+
pub const LC_NUMERIC_MASK: ::c_int = 1 << ::LC_NUMERIC;
872+
pub const LC_TIME_MASK: ::c_int = 1 << ::LC_TIME;
873+
pub const LC_MESSAGES_MASK: ::c_int = 1 << ::LC_MESSAGES;
874874
pub const LC_ALL_MASK: ::c_int = !0;
875875

876876
pub const ERA: ::nl_item = 52;

0 commit comments

Comments
 (0)