diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2006-12-23 20:31:14 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2006-12-23 20:31:14 +0000 |
| commit | 48ae1ac29b7081bfd0513faaa03be36312dfadd3 (patch) | |
| tree | 4c1fedb8dc5b01ea1bcc3f33247dd82bef38f712 | |
| parent | b8fec517237b2e49cf1e055f661fe75832403fbe (diff) | |
| download | nginx-48ae1ac29b7081bfd0513faaa03be36312dfadd3.tar.gz nginx-48ae1ac29b7081bfd0513faaa03be36312dfadd3.zip | |
early C compiler test
| -rw-r--r-- | auto/cc/name | 39 | ||||
| -rwxr-xr-x | auto/configure | 3 | ||||
| -rw-r--r-- | auto/feature | 2 |
3 files changed, 31 insertions, 13 deletions
diff --git a/auto/cc/name b/auto/cc/name index 84a37f7f8..a673e920b 100644 --- a/auto/cc/name +++ b/auto/cc/name @@ -2,7 +2,25 @@ # Copyright (C) Igor Sysoev -echo $ngx_n "checking for C compiler ...$ngx_c" +if [ "$NGX_PLATFORM" != win32 ]; then + + ngx_feature="C compiler" + ngx_feature_name= + ngx_feature_run=yes + ngx_feature_incs= + ngx_feature_path= + ngx_feature_libs= + ngx_feature_test= + . auto/feature + + if [ $ngx_found = no ]; then + echo + echo $0: error: C compiler $CC is not found + echo + exit 1 + fi + +fi if [ "$CC" = cl ]; then @@ -11,51 +29,50 @@ if [ "$CC" = cl ]; then >/dev/null 2>&1`; then NGX_CC_NAME=msvc7 - echo " Microsoft Visual C++ 7 compiler" + echo " + using Microsoft Visual C++ 7 compiler" else NGX_CC_NAME=msvc - echo " Microsoft Visual C++ compiler" + echo " + using Microsoft Visual C++ compiler" fi else if [ "$CC" = wcl386 ]; then NGX_CC_NAME=owc - echo " Open Watcom C compiler" + echo " + using Open Watcom C compiler" else if [ "$CC" = bcc32 ]; then NGX_CC_NAME=bcc - echo " Borland C++ compiler" + echo " + using Borland C++ compiler" else if `$CC -v 2>&1 | grep 'gcc version' >/dev/null 2>&1`; then NGX_CC_NAME=gcc - echo " GNU C compiler" + echo " + using GNU C compiler" else if `$CC -V 2>&1 | grep '^Intel(R) C' >/dev/null 2>&1`; then NGX_CC_NAME=icc - echo " Intel C++ compiler" + echo " + using Intel C++ compiler" else if `$CC -V 2>&1 | grep 'Sun C' >/dev/null 2>&1`; then NGX_CC_NAME=sunc - echo " Sun C compiler" + echo " + using Sun C compiler" else if `$CC -V 2>&1 | grep '^Compaq C' >/dev/null 2>&1`; then NGX_CC_NAME=ccc - echo " Compaq C compiler" + echo " + using Compaq C compiler" else if `$CC -V 2>&1 | grep '^aCC: ' >/dev/null 2>&1`; then NGX_CC_NAME=acc - echo " HP aC++ compiler" + echo " + using HP aC++ compiler" else NGX_CC_NAME=unknown - echo " unknown" fi # acc fi # ccc diff --git a/auto/configure b/auto/configure index 24acfd706..bcb8aaa3a 100755 --- a/auto/configure +++ b/auto/configure @@ -35,14 +35,15 @@ if test -z "$NGX_PLATFORM"; then else echo "building for $NGX_PLATFORM" + NGX_SYSTEM=$NGX_PLATFORM fi +. auto/cc/conf if [ "$NGX_PLATFORM" != win32 ]; then . auto/headers fi -. auto/cc/conf . auto/os/conf if [ "$NGX_PLATFORM" != win32 ]; then diff --git a/auto/feature b/auto/feature index e71b6e521..2cb405921 100644 --- a/auto/feature +++ b/auto/feature @@ -41,7 +41,7 @@ ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS $ngx_feature_inc_path \ ngx_feature_inc_path= -eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1" +eval "/bin/sh -c \"$ngx_test\" >> $NGX_AUTOCONF_ERR 2>&1" if [ -x $NGX_AUTOTEST ]; then |