Skip to content

Commit a0f1718

Browse files
committed
Use fixed path for aarch64-mingw-ucrt compiler tools
So that access is easier.
1 parent e66917d commit a0f1718

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Dockerfile.mri.erb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ RUN dpkg -i /debs/*.deb
2727
<% elsif platform =~ /aarch64-mingw-ucrt/ %>
2828
RUN wget https://github.com/mstorsjo/llvm-mingw/releases/download/20250114/llvm-mingw-20250114-ucrt-ubuntu-20.04-<%= RUBY_PLATFORM[/^\w+/] %>.tar.xz && \
2929
tar xf llvm-mingw*.tar.xz && \
30-
export MINGW_PATH=`ls -d llvm-mingw-*/` && \
31-
echo "export PATH=`pwd`/$MINGW_PATH/bin:\$PATH" >> /etc/rubybashrc && \
32-
rm -r $MINGW_PATH/bin/i686-w64* $MINGW_PATH/bin/armv7-w64* $MINGW_PATH/bin/x86_64-w64* $MINGW_PATH/i686-w64* $MINGW_PATH/armv7-w64* $MINGW_PATH/x86_64-w64*
30+
mv `ls -d llvm-mingw-*/` /llvm-mingw && \
31+
echo "export PATH=/llvm-mingw/bin:\$PATH" >> /etc/rubybashrc && \
32+
rm -r /llvm-mingw/bin/i686-w64* /llvm-mingw/bin/armv7-w64* /llvm-mingw/bin/x86_64-w64* /llvm-mingw/i686-w64* /llvm-mingw/armv7-w64* /llvm-mingw/x86_64-w64*
3333

3434
<% elsif platform =~ /linux-musl/ %>
3535
COPY build/mk_musl_cross.sh /tmp
@@ -218,7 +218,7 @@ RUN printf "1\n" | update-alternatives --config <%= target %>-gcc && \
218218
# Unfortunately libtool then forces a static build.
219219
# This is a ugly hack to make libtool beleave that the library is a DLL instead of an archive and to allow building a DLL instand.
220220
#
221-
RUN sudo cp /llvm-mingw-20250114-ucrt-ubuntu-20.04-<%= RUBY_PLATFORM[/^\w+/] %>/aarch64-w64-mingw32/bin/libc++.dll /llvm-mingw-20250114-ucrt-ubuntu-20.04-<%= RUBY_PLATFORM[/^\w+/] %>/aarch64-w64-mingw32/lib/libclang_rt.builtins-aarch64.0
221+
RUN sudo cp /llvm-mingw/aarch64-w64-mingw32/bin/libc++.dll /llvm-mingw/aarch64-w64-mingw32/lib/libclang_rt.builtins-aarch64.0
222222
<% end %>
223223

224224
<% if platform =~ /darwin/ %>

0 commit comments

Comments
 (0)