Skip to content

Commit b9d412e

Browse files
mstevebCopilot
andcommitted
Install ntldd during msys2 setup instead of later
Move ntldd installation to the msys2/setup-msys2 install step so it's available when needed, rather than trying to install it with pacman later. Also remove the redundant pacman call. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 28efc96 commit b9d412e

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

.github/workflows/makefile.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- uses: msys2/setup-msys2@v2
4242
with:
4343
msystem: mingw32
44-
install: make mingw-w64-i686-gcc mingw-w64-i686-sqlite3 mingw-w64-i686-openssl p7zip
44+
install: make mingw-w64-i686-gcc mingw-w64-i686-sqlite3 mingw-w64-i686-openssl p7zip mingw-w64-i686-ntldd
4545

4646
- name: configure
4747
run: ./configure --ssl --with-ext='sqlite3 win32 zlib' --disable-docs CFLAGS=-D__MINGW_USE_VC2005_COMPAT
@@ -56,7 +56,6 @@ jobs:
5656
run: |
5757
cp jimsh.exe jimsh_debug.exe
5858
strip jimsh.exe
59-
pacman -S --noconfirm mingw-w64-i686-ntldd
6059
ntldd -R jimsh.exe | grep -i "mingw32/bin" | awk '{print $3}' | xargs -I {} cp {} .
6160
7z a jimsh.zip jimsh.exe jimsh_debug.exe *.dll
6261

0 commit comments

Comments
 (0)