# HG changeset patch # User Igor Sysoev # Date 1166905874 0 # Node ID 756e8a5b1f7876215bd17b771fa9292941bf7113 # Parent 3a126fca07fcc26479eb9d1b3653dfbf8f02e470 early C compiler test diff --git a/auto/cc/name b/auto/cc/name --- 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 --- 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 --- a/auto/feature +++ b/auto/feature @@ -41,7 +41,7 @@ ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLA 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