|
Line
Link Here
|
| 0 |
-- Mesa-8.0.3/bin/mklib |
0 |
++ Mesa-8.0.3/bin/mklib |
|
Lines 337-343
Link Here
|
| 337 |
ARM=`file $1 | grep ARM` |
337 |
ARM=`file $1 | grep ARM` |
| 338 |
# Do not add "-m32" option for arm. |
338 |
# Do not add "-m32" option for arm. |
| 339 |
if [ -z "$ARM" -a "${ABI32}" -a `uname -m` = "x86_64" ] ; then |
339 |
if [ -z "$ARM" -a "${ABI32}" -a `uname -m` = "x86_64" ] ; then |
| 340 |
OPTS="-m32 ${OPTS}" |
340 |
ABIX32=`file $1 | grep x86-64` |
|
|
341 |
if [ "${ABIX32}" ]; then |
| 342 |
OPTS="-mx32 ${OPTS}" |
| 343 |
else |
| 344 |
OPTS="-m32 ${OPTS}" |
| 345 |
fi |
| 341 |
fi |
346 |
fi |
| 342 |
|
347 |
|
| 343 |
if [ "${ALTOPTS}" ] ; then |
348 |
if [ "${ALTOPTS}" ] ; then |
|
Lines 395-402
Link Here
|
| 395 |
ABI32=`file $1 | grep 32-bit` |
400 |
ABI32=`file $1 | grep 32-bit` |
| 396 |
ARM=`file $1 | grep ARM` |
401 |
ARM=`file $1 | grep ARM` |
| 397 |
# Do not add "-m32" option for arm. |
402 |
# Do not add "-m32" option for arm. |
| 398 |
if [ -z "$ARM" -a "${ABI32}" -a `uname -m` = "x86_64" ] ; then |
403 |
if [ -z "$ARM" -a "${ABI32}" -a `uname -m` = "x86_64" ] ; then |
| 399 |
OPTS="-m32 ${OPTS}" |
404 |
ABIX32=`file $1 | grep x86-64` |
|
|
405 |
if [ "${ABIX32}" ]; then |
| 406 |
OPTS="-mx32 ${OPTS}" |
| 407 |
else |
| 408 |
OPTS="-m32 ${OPTS}" |
| 409 |
fi |
| 400 |
fi |
410 |
fi |
| 401 |
if [ "${ALTOPTS}" ] ; then |
411 |
if [ "${ALTOPTS}" ] ; then |
| 402 |
OPTS=${ALTOPTS} |
412 |
OPTS=${ALTOPTS} |
