File tree Expand file tree Collapse file tree 22 files changed +35
-36
lines changed
aarch64-unknown-linux-gnu
arm-unknown-linux-gnueabihf
mipsel-unknown-linux-musl
powerpc-unknown-linux-gnu
powerpc64-unknown-linux-gnu
x86_64-unknown-linux-musl Expand file tree Collapse file tree 22 files changed +35
-36
lines changed Original file line number Diff line number Diff line change 1
- FROM ubuntu:16.04
1
+ FROM ubuntu:16.10
2
2
RUN apt-get update
3
3
RUN apt-get install -y --no-install-recommends \
4
4
gcc libc6-dev ca-certificates \
Original file line number Diff line number Diff line change 1
- FROM ubuntu:16.04
1
+ FROM ubuntu:16.10
2
2
RUN apt-get update
3
3
RUN apt-get install -y --no-install-recommends \
4
4
gcc libc6-dev ca-certificates \
Original file line number Diff line number Diff line change 1
- FROM ubuntu:16.04
1
+ FROM ubuntu:16.10
2
2
RUN apt-get update
3
3
RUN apt-get install -y --no-install-recommends \
4
4
gcc-multilib libc6-dev ca-certificates
Original file line number Diff line number Diff line change 1
- FROM ubuntu:16.04
1
+ FROM ubuntu:16.10
2
2
3
3
RUN apt-get update
4
4
RUN apt-get install -y --no-install-recommends \
5
5
gcc make libc6-dev git curl ca-certificates
6
- RUN curl https://www.musl-libc.org/releases/musl-1.1.14.tar.gz | \
6
+ # Below we're cross-compiling musl for i686 using the system compiler on an
7
+ # x86_64 system. This is an awkward thing to be doing and so we have to jump
8
+ # through a couple hoops to get musl to be happy. In particular:
9
+ #
10
+ # * We specifically pass -m32 in CFLAGS and override CC when running ./configure,
11
+ # since otherwise the script will fail to find a compiler.
12
+ # * We manually unset CROSS_COMPILE when running make; otherwise the makefile
13
+ # will call the non-existent binary 'i686-ar'.
14
+ RUN curl https://www.musl-libc.org/releases/musl-1.1.15.tar.gz | \
7
15
tar xzf - && \
8
- cd musl-1.1.14 && \
9
- CFLAGS=-m32 ./configure --prefix=/musl-i686 --disable-shared --target=i686 && \
10
- make install -j4 && \
16
+ cd musl-1.1.15 && \
17
+ CC=gcc CFLAGS=-m32 ./configure --prefix=/musl-i686 --disable-shared --target=i686 && \
18
+ make CROSS_COMPILE= install -j4 && \
11
19
cd .. && \
12
- rm -rf musl-1.1.14
20
+ rm -rf musl-1.1.15
13
21
ENV PATH=$PATH:/musl-i686/bin:/rust/bin
Original file line number Diff line number Diff line change 1
- FROM ubuntu:16.04
1
+ FROM ubuntu:16.10
2
2
3
3
RUN apt-get update
4
4
RUN apt-get install -y --no-install-recommends \
Original file line number Diff line number Diff line change 1
- FROM ubuntu:16.04
1
+ FROM ubuntu:16.10
2
2
3
3
RUN apt-get update
4
4
RUN apt-get install -y --no-install-recommends \
Original file line number Diff line number Diff line change 1
- FROM ubuntu:16.04
1
+ FROM ubuntu:16.10
2
2
3
3
RUN apt-get update
4
4
RUN apt-get install -y --no-install-recommends \
Original file line number Diff line number Diff line change 1
- FROM ubuntu:16.04
1
+ FROM ubuntu:16.10
2
2
3
3
RUN apt-get update
4
4
RUN apt-get install -y --no-install-recommends \
Original file line number Diff line number Diff line change 1
- FROM ubuntu:16.04
1
+ FROM ubuntu:16.10
2
2
3
3
RUN apt-get update
4
4
RUN apt-get install -y --no-install-recommends \
Original file line number Diff line number Diff line change 1
- FROM ubuntu:16.04
1
+ FROM ubuntu:16.10
2
2
RUN apt-get update
3
3
RUN apt-get install -y --no-install-recommends \
4
4
gcc libc6-dev ca-certificates
Original file line number Diff line number Diff line change 1
- FROM ubuntu:16.04
1
+ FROM ubuntu:16.10
2
2
3
3
RUN apt-get update
4
4
RUN apt-get install -y --no-install-recommends \
5
5
gcc make libc6-dev git curl ca-certificates
6
- RUN curl https://www.musl-libc.org/releases/musl-1.1.14 .tar.gz | \
6
+ RUN curl https://www.musl-libc.org/releases/musl-1.1.15 .tar.gz | \
7
7
tar xzf - && \
8
- cd musl-1.1.14 && \
8
+ cd musl-1.1.15 && \
9
9
./configure --prefix=/musl-x86_64 && \
10
10
make install -j4 && \
11
11
cd .. && \
12
- rm -rf musl-1.1.14
12
+ rm -rf musl-1.1.15
13
13
ENV PATH=$PATH:/musl-x86_64/bin:/rust/bin
Original file line number Diff line number Diff line change 1
- FROM ubuntu:16.04
1
+ FROM ubuntu:16.10
2
2
3
3
RUN apt-get update
4
4
RUN apt-get install -y --no-install-recommends \
Original file line number Diff line number Diff line change @@ -233,12 +233,10 @@ pub const POSIX_FADV_DONTNEED: ::c_int = 4;
233
233
pub const POSIX_FADV_NOREUSE : :: c_int = 5 ;
234
234
pub const POSIX_MADV_DONTNEED : :: c_int = 4 ;
235
235
pub const _SC_2_C_VERSION: :: c_int = 96 ;
236
- pub const RUSAGE_THREAD : :: c_int = 1 ;
237
236
pub const O_ACCMODE : :: c_int = 3 ;
238
237
pub const O_DIRECT : :: c_int = 0x8000 ;
239
238
pub const O_DIRECTORY : :: c_int = 0x10000 ;
240
239
pub const O_NOFOLLOW : :: c_int = 0x20000 ;
241
- pub const RUSAGE_CHILDREN : :: c_int = -1 ;
242
240
pub const ST_RELATIME : :: c_ulong = 4096 ;
243
241
pub const NI_MAXHOST : :: socklen_t = 1025 ;
244
242
Original file line number Diff line number Diff line change @@ -248,6 +248,8 @@ pub const ABMON_10: ::nl_item = 0x20017;
248
248
pub const ABMON_11 : :: nl_item = 0x20018 ;
249
249
pub const ABMON_12 : :: nl_item = 0x20019 ;
250
250
251
+ pub const CLONE_NEWCGROUP : :: c_int = 0x02000000 ;
252
+
251
253
pub const MON_1 : :: nl_item = 0x2001A ;
252
254
pub const MON_2 : :: nl_item = 0x2001B ;
253
255
pub const MON_3 : :: nl_item = 0x2001C ;
@@ -279,6 +281,9 @@ pub const CODESET: ::nl_item = 14;
279
281
280
282
pub const CRNCYSTR : :: nl_item = 0x4000F ;
281
283
284
+ pub const RUSAGE_THREAD : :: c_int = 1 ;
285
+ pub const RUSAGE_CHILDREN : :: c_int = -1 ;
286
+
282
287
pub const RADIXCHAR : :: nl_item = 0x10000 ;
283
288
pub const THOUSEP : :: nl_item = 0x10001 ;
284
289
Original file line number Diff line number Diff line change @@ -332,7 +332,5 @@ pub const TIOCCONS: ::c_int = 0x541D;
332
332
pub const SYS_gettid : :: c_long = 224 ;
333
333
pub const SYS_perf_event_open : :: c_long = 364 ;
334
334
335
- pub const POSIX_MADV_DONTNEED : :: c_int = 0 ;
336
- pub const RUSAGE_CHILDREN : :: c_int = 1 ;
337
335
pub const POLLWRNORM : :: c_short = 0x100 ;
338
336
pub const POLLWRBAND : :: c_short = 0x200 ;
Original file line number Diff line number Diff line change @@ -331,7 +331,5 @@ pub const TIOCCONS: ::c_int = 0x541D;
331
331
332
332
pub const SYS_gettid : :: c_long = 224 ; // Valid for arm (32-bit) and x86 (32-bit)
333
333
334
- pub const POSIX_MADV_DONTNEED : :: c_int = 0 ;
335
- pub const RUSAGE_CHILDREN : :: c_int = 1 ;
336
334
pub const POLLWRNORM : :: c_short = 0x100 ;
337
335
pub const POLLWRBAND : :: c_short = 0x200 ;
Original file line number Diff line number Diff line change @@ -340,7 +340,5 @@ pub const TIOCCONS: ::c_int = 0x80047478;
340
340
pub const SYS_gettid : :: c_long = 4222 ; // Valid for O32
341
341
pub const SYS_perf_event_open : :: c_long = 4333 ; // Valid for O32
342
342
343
- pub const POSIX_MADV_DONTNEED : :: c_int = 4 ;
344
- pub const RUSAGE_CHILDREN : :: c_int = !0 ;
345
343
pub const POLLWRNORM : :: c_short = 0x4 ;
346
344
pub const POLLWRBAND : :: c_short = 0x100 ;
Original file line number Diff line number Diff line change @@ -346,7 +346,5 @@ pub const TIOCCONS: ::c_int = 0x541D;
346
346
pub const SYS_gettid : :: c_long = 224 ;
347
347
pub const SYS_perf_event_open : :: c_long = 336 ;
348
348
349
- pub const POSIX_MADV_DONTNEED : :: c_int = 0 ;
350
- pub const RUSAGE_CHILDREN : :: c_int = 1 ;
351
349
pub const POLLWRNORM : :: c_short = 0x100 ;
352
350
pub const POLLWRBAND : :: c_short = 0x200 ;
Original file line number Diff line number Diff line change @@ -351,8 +351,6 @@ pub const TIOCMSET: ::c_int = 0x5418;
351
351
pub const FIONREAD : :: c_int = 0x541B ;
352
352
pub const TIOCCONS : :: c_int = 0x541D ;
353
353
354
- pub const POSIX_MADV_DONTNEED : :: c_int = 0 ;
355
- pub const RUSAGE_CHILDREN : :: c_int = 1 ;
356
354
pub const POLLWRNORM : :: c_short = 0x100 ;
357
355
pub const POLLWRBAND : :: c_short = 0x200 ;
358
356
Original file line number Diff line number Diff line change @@ -77,6 +77,8 @@ pub const PTHREAD_STACK_MIN: ::size_t = 2048;
77
77
pub const POSIX_FADV_DONTNEED : :: c_int = 4 ;
78
78
pub const POSIX_FADV_NOREUSE : :: c_int = 5 ;
79
79
80
+ pub const POSIX_MADV_DONTNEED : :: c_int = 4 ;
81
+
80
82
pub const RLIM_INFINITY : :: rlim_t = !0 ;
81
83
pub const RLIMIT_RTTIME : :: c_int = 15 ;
82
84
pub const RLIMIT_NLIMITS : :: c_int = 16 ;
Original file line number Diff line number Diff line change @@ -360,11 +360,9 @@ pub const POSIX_FADV_DONTNEED: ::c_int = 4;
360
360
pub const POSIX_FADV_NOREUSE : :: c_int = 5 ;
361
361
pub const POSIX_MADV_DONTNEED : :: c_int = 4 ;
362
362
pub const _SC_2_C_VERSION: :: c_int = 96 ;
363
- pub const RUSAGE_THREAD : :: c_int = 1 ;
364
363
pub const O_ACCMODE : :: c_int = 3 ;
365
364
pub const O_ASYNC : :: c_int = 0x2000 ;
366
365
pub const O_NDELAY : :: c_int = 0x800 ;
367
- pub const RUSAGE_CHILDREN : :: c_int = -1 ;
368
366
pub const ST_RELATIME : :: c_ulong = 4096 ;
369
367
pub const NI_MAXHOST : :: socklen_t = 1025 ;
370
368
Original file line number Diff line number Diff line change @@ -464,10 +464,8 @@ pub const TMP_MAX: ::c_uint = 238328;
464
464
pub const FOPEN_MAX : :: c_uint = 16 ;
465
465
pub const POSIX_MADV_DONTNEED : :: c_int = 4 ;
466
466
pub const _SC_2_C_VERSION: :: c_int = 96 ;
467
- pub const RUSAGE_THREAD : :: c_int = 1 ;
468
467
pub const O_ASYNC : :: c_int = 0x2000 ;
469
468
pub const O_NDELAY : :: c_int = 0x800 ;
470
- pub const RUSAGE_CHILDREN : :: c_int = -1 ;
471
469
pub const ST_RELATIME : :: c_ulong = 4096 ;
472
470
pub const NI_MAXHOST : :: socklen_t = 1025 ;
473
471
You can’t perform that action at this time.
0 commit comments