diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-30 10:36:15 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-30 10:36:15 +0200 |
| commit | 762b7fde3d57d3a151f98535fd31516b7e823bc0 (patch) | |
| tree | 11c32921b96808f2aab11a86863534fb28b274f6 /mesalib/bin/mklib | |
| parent | b68922d51f52ca6ab9daa0105ef5c57f35bfbdcf (diff) | |
| download | vcxsrv-762b7fde3d57d3a151f98535fd31516b7e823bc0.tar.gz vcxsrv-762b7fde3d57d3a151f98535fd31516b7e823bc0.tar.bz2 vcxsrv-762b7fde3d57d3a151f98535fd31516b7e823bc0.zip | |
fontconfig libX11 libfontenc mesa pixman xserver git update 30 Apr 2012
Diffstat (limited to 'mesalib/bin/mklib')
| -rw-r--r-- | mesalib/bin/mklib | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mesalib/bin/mklib b/mesalib/bin/mklib index 56e0b36d1..9bac29ea8 100644 --- a/mesalib/bin/mklib +++ b/mesalib/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 |