Skip to content

Commit 37d71e5

Browse files
committed
xx-verify: since file 5.46 it expects Intel i386
Signed-off-by: CrazyMax <[email protected]>
1 parent 59bc5d8 commit 37d71e5

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

src/xx-verify

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,8 @@ for f in "$@"; do
144144
fi
145145

146146
expArch=""
147-
expArch2="" # extra check for endianness
147+
expArchAlt="" # alternate arch name
148+
expArch2="" # extra check for endianness
148149
case "$TARGETARCH" in
149150
"arm64")
150151
case "$TARGETOS" in
@@ -226,7 +227,8 @@ for f in "$@"; do
226227
expArch2="64-bit LSB"
227228
;;
228229
"386")
229-
expArch="Intel 80386"
230+
expArch="Intel i386"
231+
expArchAlt="Intel 80386"
230232
if [ "$TARGETOS" != "windows" ]; then
231233
expArch2="32-bit LSB"
232234
fi
@@ -239,8 +241,15 @@ for f in "$@"; do
239241
fi
240242

241243
if ! echo "$out" | grep "$expArch" >/dev/null; then
242-
echo >&2 "file ${f} does not match expected target architecture ${TARGETARCH}: $out"
243-
exit 1
244+
if [ -n "$expArchAlt" ]; then
245+
if ! echo "$out" | grep "$expArchAlt" >/dev/null; then
246+
echo >&2 "file ${f} does not match expected target architecture ${TARGETARCH}: $out"
247+
exit 1
248+
fi
249+
else
250+
echo >&2 "file ${f} does not match expected target architecture ${TARGETARCH}: $out"
251+
exit 1
252+
fi
244253
fi
245254

246255
if [ -n "$expArch2" ]; then

0 commit comments

Comments
 (0)