bin/mklib: remove '-m32' for arm linux

-m32 is not a valid option for ARM.

NOTE: This is a candidate for the 8.0 branch.

Signed-off-by: Brian Paul <brianp@vmware.com>

diff --git a/bin/mklib b/bin/mklib
index 56e0b36d146233aa7060f55f77b0ed3461be315b..9bac29ea85924af510bbbe2a53cd3ef207a3e4bc 100755 (executable)
--- a/bin/mklib
+++ b/bin/mklib
@@ -334,7 +334,9 @@ case $ARCH in
            # environment.  If so, pass -m32 flag to linker.
            set ${OBJECTS}
            ABI32=`file $1 | grep 32-bit`
-           if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
+           ARM=`file $1 | grep ARM`
+           # Do not add "-m32" option for arm.
+            if [ -z "$ARM" -a "${ABI32}" -a `uname -m` = "x86_64" ] ; then
                OPTS="-m32 ${OPTS}"
            fi
 
@@ -391,7 +393,9 @@ case $ARCH in
            # environment.  If so, pass -m32 flag to linker.
            set ${OBJECTS}
            ABI32=`file $1 | grep 32-bit`
-           if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
+            ARM=`file $1 | grep ARM`
+           # Do not add "-m32" option for arm.
+            if [ -z "$ARM" -a "${ABI32}" -a `uname -m` = "x86_64" ] ; then
                OPTS="-m32 ${OPTS}"
            fi
             if [ "${ALTOPTS}" ] ; then