From 61f2baa0af6b2a54e0c109e5f73c8ff25f9f2ca6 Mon Sep 17 00:00:00 2001
From: Daniel Mueller <deso@posteo.net>
Date: Sat, 1 Jun 2019 11:46:58 -0700
Subject: Update libc crate to 0.2.57
This change updates the libc crate to version 0.2.57.
Import subrepo libc/:libc at cdc48ea36d8d2890dba38e8f779001e6855339a2
---
libc/ci/docker/i686-unknown-linux-musl/Dockerfile | 25 +++--------------------
1 file changed, 3 insertions(+), 22 deletions(-)
(limited to 'libc/ci/docker/i686-unknown-linux-musl')
diff --git a/libc/ci/docker/i686-unknown-linux-musl/Dockerfile b/libc/ci/docker/i686-unknown-linux-musl/Dockerfile
index c085c10..ac76a32 100644
--- a/libc/ci/docker/i686-unknown-linux-musl/Dockerfile
+++ b/libc/ci/docker/i686-unknown-linux-musl/Dockerfile
@@ -4,28 +4,9 @@ RUN dpkg --add-architecture i386
RUN apt-get update
RUN apt-get install -y --no-install-recommends \
gcc-multilib make libc6-dev git curl ca-certificates libc6:i386
-# Below we're cross-compiling musl for i686 using the system compiler on an
-# x86_64 system. This is an awkward thing to be doing and so we have to jump
-# through a couple hoops to get musl to be happy. In particular:
-#
-# * We specifically pass -m32 in CFLAGS and override CC when running ./configure,
-# since otherwise the script will fail to find a compiler.
-# * We manually unset CROSS_COMPILE when running make; otherwise the makefile
-# will call the non-existent binary 'i686-ar'.
-RUN curl --retry 5 https://www.musl-libc.org/releases/musl-1.1.19.tar.gz | \
- tar xzf - && \
- cd musl-1.1.19 && \
- CC=gcc CFLAGS=-m32 ./configure --prefix=/musl-i686 --disable-shared --target=i686 && \
- make CROSS_COMPILE= install -j4 && \
- cd .. && \
- rm -rf musl-1.1.19
-# Install linux kernel headers sanitized for use with musl
-RUN curl --retry 5 -L https://github.com/sabotage-linux/kernel-headers/archive/v3.12.6-6.tar.gz | \
- tar xzf - && \
- cd kernel-headers-3.12.6-6 && \
- make ARCH=i386 prefix=/musl-i686 install -j4 && \
- cd .. && \
- rm -rf kernel-headers-3.12.6-6
+
+COPY install-musl.sh /
+RUN sh /install-musl.sh i686
ENV PATH=$PATH:/musl-i686/bin:/rust/bin \
CC_i686_unknown_linux_musl=musl-gcc
--
cgit v1.2.3