Skip to content

Commit 1038558

Browse files
committed
Use single script for both Dockerfiles
1 parent cecb0f9 commit 1038558

File tree

4 files changed

+4
-13
lines changed

4 files changed

+4
-13
lines changed

src/ci/docker/host-x86_64/dist-aarch64-windows-gnullvm/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1414
python3 \
1515
xz-utils
1616

17-
COPY host-x86_64/dist-aarch64-windows-gnullvm/install-llvm-mingw.sh /build
17+
ENV ARCH=aarch64
18+
COPY host-x86_64/dist-x86_64-windows-gnullvm/install-llvm-mingw.sh /build
1819
RUN ./install-llvm-mingw.sh
1920

2021
COPY scripts/sccache.sh /scripts/

src/ci/docker/host-x86_64/dist-aarch64-windows-gnullvm/install-llvm-mingw.sh

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/ci/docker/host-x86_64/dist-x86_64-windows-gnullvm/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1414
python3 \
1515
xz-utils
1616

17+
ENV ARCH='i686 x86_64'
1718
COPY host-x86_64/dist-x86_64-windows-gnullvm/install-llvm-mingw.sh /build
1819
RUN ./install-llvm-mingw.sh
1920

src/ci/docker/host-x86_64/dist-x86_64-windows-gnullvm/install-llvm-mingw.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ curl -L https://github.com/mstorsjo/llvm-mingw/releases/download/${release_date}
88
tar --extract --xz --strip 1 --directory /usr/local
99

1010
# https://github.com/mstorsjo/llvm-mingw/issues/493
11-
for arch in i686 x86_64; do
11+
for arch in $ARCH; do
1212
ln -s $arch-w64-windows-gnu.cfg /usr/local/bin/$arch-pc-windows-gnu.cfg
1313
done

0 commit comments

Comments
 (0)