Skip to content

Commit 6f92a0e

Browse files
committed
make-file-list: work around 32-bit issues
A couple of stale `.dll` files seem to have different properties from their 64-bit counterpart. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent e1d6231 commit 6f92a0e

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

make-file-list.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,12 @@ grep -v -e '\.[acho]$' -e '\.l[ao]$' -e '/aclocal/' \
164164
-e '^/mingw../share/git\(k\|-gui\)/lib/msgs/' \
165165
-e '^/mingw../share/nghttp2/' \
166166
-e '^/usr/bin/msys-\(db\|curl\|icu\|gfortran\|stdc++\|quadmath\)[^/]*\.dll$' \
167-
-e '^/usr/bin/msys-\(fdisk\|gettextpo\|gmpxx\|gnutlsxx\|gomp\|lzma\|xml2\|xslt\|exslt\)-.*\.dll$' \
167+
-e '^/usr/bin/msys-\('$(if test i686 = "$ARCH"
168+
then
169+
echo 'uuid\|'
170+
else
171+
echo 'lzma\|'
172+
fi)'fdisk\|gettextpo\|gmpxx\|gnutlsxx\|gomp\|xml2\|xslt\|exslt\)-.*\.dll$' \
168173
-e '^/usr/bin/msys-\(hdb\|history8\|kadm5\|kdc\|otp\|sl\).*\.dll$' \
169174
-e '^/usr/bin/msys-\(atomic\|blkid\|charset\|gthread\|metalink\|nghttp2\|pcre2-8\|ssh2\)-.*\.dll$' \
170175
-e '^/usr/bin/msys-\(ncurses++w6\|asprintf-[0-9]*\|\)\.dll$' \

0 commit comments

Comments
 (0)