check-cross-arch: Update i386 check to match pie binaries

faiproject · Sep 30, 2021 · 6be2136 · 6be2136
1 parent c305dfa
commit 6be2136
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/check-cross-arch b/lib/check-cross-arch
@@ -17,8 +17,9 @@ fi
 
 info=$(file /bin/more)
 myarch=$(expr "$info" : '.*ld-linux-\([^[:space:]]*\).so.*')
+i386_re="ELF 32-bit LSB (shared object|pie executable), Intel 80386"
 if [ -z "$myarch" ]; then
-    if [[ "$info" =~  "ELF 32-bit LSB shared object, Intel 80386" ]]; then
+    if [[ "$info" =~  $i386_re ]]; then
 	myarch=i386
     fi
 fi
@@ -38,7 +39,7 @@ _more=$target/${_more#$target}
 info=$(file $_more)
 targetarch=$(expr "$info" : '.*ld-linux-\([^[:space:]]*\).so.*')
 if [ -z "$targetarch" ]; then
-    if [[ "$info" =~  "ELF 32-bit LSB shared object, Intel 80386" ]]; then
+    if [[ "$info" =~  $i386_re ]]; then
 	targetarch=i386
     fi
 fi