auto/configure [ PAUSE ] hwcap bug

This commit is contained in:
Igor Sysoev 2006-09-18 12:27:33 +00:00
parent 993b9da855
commit 2bdefc12d8
2 changed files with 19 additions and 5 deletions

View File

@ -3,9 +3,10 @@
# Sun C 5.7 Patch 117837-04 2005/05/11
# Sun C 5.8 2005/10/13
NGX_SUNC_VER=`$CC -V 2>&1 | grep 'Sun C' 2>&1 \
| sed -e 's/^.* Sun C \(.*\)/\1/'`
| sed -e 's/^.* Sun C \(.*\)/\1/'`
echo " + Sun C version: $NGX_SUNC_VER"
@ -15,8 +16,19 @@ have=NGX_COMPILER value="\"Sun C $NGX_SUNC_VER\"" . auto/define
case "$NGX_PLATFORM" in
*:i86pc)
# disable [ PAUSE ] hwcap for Sun Studio 11
CORE_LINK="$CORE_LINK -Msrc/os/unix/ngx_sunpro_x86.map"
ngx_feature="PAUSE hardware capability bug"
ngx_feature_name=
ngx_feature_run=bug
ngx_feature_incs=
ngx_feature_libs=
ngx_feature_test='__asm ("pause")'
. auto/feature
if [ $ngx_found = yes ]; then
# disable [ PAUSE ] hwcap for Sun Studio 11
CORE_LINK="$CORE_LINK -Msrc/os/unix/ngx_sunpro_x86.map"
fi
NGX_AUX=" src/os/unix/ngx_sunpro_x86.il"
;;

View File

@ -43,7 +43,8 @@ if [ -x $NGX_AUTOTEST ]; then
case "$ngx_feature_run" in
yes)
if $NGX_AUTOTEST 2>&1 > /dev/null; then
# /bin/sh is used to intercept "Killed" or "Abort trap" messages
if /bin/sh $NGX_AUTOTEST > /dev/null 2>&1; then
echo " found"
ngx_found=yes
@ -57,7 +58,8 @@ if [ -x $NGX_AUTOTEST ]; then
;;
bug)
if $NGX_AUTOTEST 2>&1 > /dev/null; then
# /bin/sh is used to intercept "Killed" or "Abort trap" messages
if /bin/sh $NGX_AUTOTEST > /dev/null 2>&1; then
echo " not found"
else