Skip to content
Snippets Groups Projects
Commit 1abcbda8 authored by Pascal Bach's avatar Pascal Bach
Browse files

use new headers for musl build

parent aa41265f
No related branches found
No related tags found
No related merge requests found
...@@ -10,14 +10,14 @@ RUN curl https://www.musl-libc.org/releases/musl-1.1.19.tar.gz | \ ...@@ -10,14 +10,14 @@ RUN curl https://www.musl-libc.org/releases/musl-1.1.19.tar.gz | \
./configure --prefix=/musl-aarch64 --enable-wrapper=yes && \ ./configure --prefix=/musl-aarch64 --enable-wrapper=yes && \
make install -j4 && \ make install -j4 && \
cd .. && \ cd .. && \
rm -rf musl-1.1.19 && \ rm -rf musl-1.1.19
# Install linux kernel headers sanitized for use with musl # Install linux kernel headers sanitized for use with musl
curl -L https://github.com/sabotage-linux/kernel-headers/archive/v3.12.6-5.tar.gz | \ RUN curl -L https://github.com/sabotage-linux/kernel-headers/archive/v3.12.6-6.tar.gz | \
tar xzf - && \ tar xzf - && \
cd kernel-headers-3.12.6-5 && \ cd kernel-headers-3.12.6-6 && \
make ARCH=arm64 prefix=/musl-aarch64 install -j4 && \ make ARCH=arm64 prefix=/musl-aarch64 install -j4 && \
cd .. && \ cd .. && \
rm -rf kernel-headers-3.12.6-5 rm -rf kernel-headers-3.12.6-6
# FIXME: shouldn't need the `-lgcc` here, shouldn't that be in libstd? # FIXME: shouldn't need the `-lgcc` here, shouldn't that be in libstd?
ENV PATH=$PATH:/musl-aarch64/bin:/rust/bin \ ENV PATH=$PATH:/musl-aarch64/bin:/rust/bin \
......
...@@ -12,13 +12,13 @@ RUN CC=arm-linux-gnueabihf-gcc \ ...@@ -12,13 +12,13 @@ RUN CC=arm-linux-gnueabihf-gcc \
RUN make install -j4 RUN make install -j4
# Install linux kernel headers sanitized for use with musl # Install linux kernel headers sanitized for use with musl
RUN \ RUN curl -L https://github.com/sabotage-linux/kernel-headers/archive/v3.12.6-6.tar.gz | \
curl -L https://github.com/sabotage-linux/kernel-headers/archive/v3.12.6-5.tar.gz | \
tar xzf - && \ tar xzf - && \
cd kernel-headers-3.12.6-5 && \ cd kernel-headers-3.12.6-6 && \
make ARCH=arm prefix=/musl-arm install -j4 && \ make ARCH=arm prefix=/musl-arm install -j4 && \
cd .. && \ cd .. && \
rm -rf kernel-headers-3.12.6-5 rm -rf kernel-headers-3.12.6-6
ENV PATH=$PATH:/musl-arm/bin:/rust/bin \ ENV PATH=$PATH:/musl-arm/bin:/rust/bin \
CC_arm_unknown_linux_musleabihf=musl-gcc \ CC_arm_unknown_linux_musleabihf=musl-gcc \
CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABIHF_LINKER=musl-gcc \ CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABIHF_LINKER=musl-gcc \
......
...@@ -18,13 +18,14 @@ RUN curl https://www.musl-libc.org/releases/musl-1.1.19.tar.gz | \ ...@@ -18,13 +18,14 @@ RUN curl https://www.musl-libc.org/releases/musl-1.1.19.tar.gz | \
CC=gcc CFLAGS=-m32 ./configure --prefix=/musl-i686 --disable-shared --target=i686 && \ CC=gcc CFLAGS=-m32 ./configure --prefix=/musl-i686 --disable-shared --target=i686 && \
make CROSS_COMPILE= install -j4 && \ make CROSS_COMPILE= install -j4 && \
cd .. && \ cd .. && \
rm -rf musl-1.1.19 && \ rm -rf musl-1.1.19
# Install linux kernel headers sanitized for use with musl # Install linux kernel headers sanitized for use with musl
curl -L https://github.com/sabotage-linux/kernel-headers/archive/v3.12.6-5.tar.gz | \ RUN curl -L https://github.com/sabotage-linux/kernel-headers/archive/v3.12.6-6.tar.gz | \
tar xzf - && \ tar xzf - && \
cd kernel-headers-3.12.6-5 && \ cd kernel-headers-3.12.6-6 && \
make ARCH=i386 prefix=/musl-i686 install -j4 && \ make ARCH=i386 prefix=/musl-i686 install -j4 && \
cd .. && \ cd .. && \
rm -rf kernel-headers-3.12.6-5 rm -rf kernel-headers-3.12.6-6
ENV PATH=$PATH:/musl-i686/bin:/rust/bin \ ENV PATH=$PATH:/musl-i686/bin:/rust/bin \
CC_i686_unknown_linux_musl=musl-gcc CC_i686_unknown_linux_musl=musl-gcc
...@@ -9,12 +9,12 @@ RUN curl https://www.musl-libc.org/releases/musl-1.1.19.tar.gz | \ ...@@ -9,12 +9,12 @@ RUN curl https://www.musl-libc.org/releases/musl-1.1.19.tar.gz | \
./configure --prefix=/musl-x86_64 && \ ./configure --prefix=/musl-x86_64 && \
make install -j4 && \ make install -j4 && \
cd .. && \ cd .. && \
rm -rf musl-1.1.19 && \ rm -rf musl-1.1.19
# Install linux kernel headers sanitized for use with musl # Install linux kernel headers sanitized for use with musl
curl -L https://github.com/sabotage-linux/kernel-headers/archive/v3.12.6-5.tar.gz | \ RUN curl -L https://github.com/sabotage-linux/kernel-headers/archive/v3.12.6-6.tar.gz | \
tar xzf - && \ tar xzf - && \
cd kernel-headers-3.12.6-5 && \ cd kernel-headers-3.12.6-6 && \
make ARCH=x86_64 prefix=/musl-x86_64 install -j4 && \ make ARCH=x86_64 prefix=/musl-x86_64 install -j4 && \
cd .. && \ cd .. && \
rm -rf kernel-headers-3.12.6-5 rm -rf kernel-headers-3.12.6-6
ENV PATH=$PATH:/musl-x86_64/bin:/rust/bin ENV PATH=$PATH:/musl-x86_64/bin:/rust/bin
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment