summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHan Shen(沈涵) <shenhan@google.com>2012-04-23 08:28:12 -0600
committerBrian Paul <brianp@vmware.com>2012-04-23 13:27:07 -0600
commitb352d676e4ab8656a4fbae33493e5adf3a932708 (patch)
treebf1ed181e1ac5ea697036352692f4b3eb75ad415
parent99ed0b2f9b95a484aa78aeee0277bb669611be5b (diff)
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>
-rwxr-xr-xbin/mklib8
1 files changed, 6 insertions, 2 deletions
diff --git a/bin/mklib b/bin/mklib
index 56e0b36d146..9bac29ea859 100755
--- 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