diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2006-09-18 12:27:33 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2006-09-18 12:27:33 +0000 |
| commit | 2bdefc12d89b4d60082df6d4db24f1d67887a951 (patch) | |
| tree | 2054e30befb83cb796c254b542ad7778734834d3 | |
| parent | 993b9da85592df2320ed92921fee6be309ef49a4 (diff) | |
| download | nginx-2bdefc12d89b4d60082df6d4db24f1d67887a951.tar.gz nginx-2bdefc12d89b4d60082df6d4db24f1d67887a951.tar.bz2 | |
auto/configure [ PAUSE ] hwcap bug
| -rw-r--r-- | auto/cc/sunc | 18 | ||||
| -rw-r--r-- | auto/feature | 6 |
2 files changed, 19 insertions, 5 deletions
diff --git a/auto/cc/sunc b/auto/cc/sunc index a9e32c283..e4ea868d8 100644 --- a/auto/cc/sunc +++ b/auto/cc/sunc @@ -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" ;; diff --git a/auto/feature b/auto/feature index 6ad008ae0..37420e3d6 100644 --- a/auto/feature +++ b/auto/feature @@ -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 |