Skip to content

Commit 3ce792b

Browse files
committed
WIP: use new headers for musl build
1 parent aa41265 commit 3ce792b

File tree

4 files changed

+17
-16
lines changed

4 files changed

+17
-16
lines changed

ci/docker/aarch64-unknown-linux-musl/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ RUN curl https://www.musl-libc.org/releases/musl-1.1.19.tar.gz | \
1010
./configure --prefix=/musl-aarch64 --enable-wrapper=yes && \
1111
make install -j4 && \
1212
cd .. && \
13-
rm -rf musl-1.1.19 && \
13+
rm -rf musl-1.1.19
1414
# Install linux kernel headers sanitized for use with musl
15-
curl -L https://github.com/sabotage-linux/kernel-headers/archive/v3.12.6-5.tar.gz | \
15+
RUN curl -L https://github.com/bachp/kernel-headers/archive/v3.12.6-6.tar.gz | \
1616
tar xzf - && \
17-
cd kernel-headers-3.12.6-5 && \
17+
cd kernel-headers-3.12.6-6 && \
1818
make ARCH=arm64 prefix=/musl-aarch64 install -j4 && \
1919
cd .. && \
20-
rm -rf kernel-headers-3.12.6-5
20+
rm -rf kernel-headers-3.12.6-6
2121

2222
# FIXME: shouldn't need the `-lgcc` here, shouldn't that be in libstd?
2323
ENV PATH=$PATH:/musl-aarch64/bin:/rust/bin \

ci/docker/arm-unknown-linux-musleabihf/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ RUN CC=arm-linux-gnueabihf-gcc \
1212
RUN make install -j4
1313

1414
# Install linux kernel headers sanitized for use with musl
15-
RUN \
16-
curl -L https://github.com/sabotage-linux/kernel-headers/archive/v3.12.6-5.tar.gz | \
15+
RUN curl -L https://github.com/bachp/kernel-headers/archive/v3.12.6-6.tar.gz | \
1716
tar xzf - && \
18-
cd kernel-headers-3.12.6-5 && \
17+
cd kernel-headers-3.12.6-6 && \
1918
make ARCH=arm prefix=/musl-arm install -j4 && \
2019
cd .. && \
21-
rm -rf kernel-headers-3.12.6-5
20+
rm -rf kernel-headers-3.12.6-6
21+
2222
ENV PATH=$PATH:/musl-arm/bin:/rust/bin \
2323
CC_arm_unknown_linux_musleabihf=musl-gcc \
2424
CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABIHF_LINKER=musl-gcc \

ci/docker/i686-unknown-linux-musl/Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@ RUN curl https://www.musl-libc.org/releases/musl-1.1.19.tar.gz | \
1818
CC=gcc CFLAGS=-m32 ./configure --prefix=/musl-i686 --disable-shared --target=i686 && \
1919
make CROSS_COMPILE= install -j4 && \
2020
cd .. && \
21-
rm -rf musl-1.1.19 && \
21+
rm -rf musl-1.1.19
2222
# Install linux kernel headers sanitized for use with musl
23-
curl -L https://github.com/sabotage-linux/kernel-headers/archive/v3.12.6-5.tar.gz | \
23+
RUN curl -L https://github.com/bachp/kernel-headers/archive/v3.12.6-6.tar.gz | \
2424
tar xzf - && \
25-
cd kernel-headers-3.12.6-5 && \
25+
cd kernel-headers-3.12.6-6 && \
2626
make ARCH=i386 prefix=/musl-i686 install -j4 && \
2727
cd .. && \
28-
rm -rf kernel-headers-3.12.6-5
28+
rm -rf kernel-headers-3.12.6-6
29+
2930
ENV PATH=$PATH:/musl-i686/bin:/rust/bin \
3031
CC_i686_unknown_linux_musl=musl-gcc

ci/docker/x86_64-unknown-linux-musl/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ RUN curl https://www.musl-libc.org/releases/musl-1.1.19.tar.gz | \
99
./configure --prefix=/musl-x86_64 && \
1010
make install -j4 && \
1111
cd .. && \
12-
rm -rf musl-1.1.19 && \
12+
rm -rf musl-1.1.19
1313
# Install linux kernel headers sanitized for use with musl
14-
curl -L https://github.com/sabotage-linux/kernel-headers/archive/v3.12.6-5.tar.gz | \
14+
RUN curl -L https://github.com/bachp/kernel-headers/archive/v3.12.6-6.tar.gz | \
1515
tar xzf - && \
16-
cd kernel-headers-3.12.6-5 && \
16+
cd kernel-headers-3.12.6-6 && \
1717
make ARCH=x86_64 prefix=/musl-x86_64 install -j4 && \
1818
cd .. && \
19-
rm -rf kernel-headers-3.12.6-5
19+
rm -rf kernel-headers-3.12.6-6
2020
ENV PATH=$PATH:/musl-x86_64/bin:/rust/bin

0 commit comments

Comments
 (0)