diff options
Diffstat (limited to 'auto/cc/conf')
| -rw-r--r-- | auto/cc/conf | 50 |
1 files changed, 27 insertions, 23 deletions
diff --git a/auto/cc/conf b/auto/cc/conf index f064bca0d..b2eabebe5 100644 --- a/auto/cc/conf +++ b/auto/cc/conf @@ -42,30 +42,30 @@ else case $NGX_CC_NAME in gcc) - # gcc 2.7.2.3, 2.8.1, 2.95.4, - # 3.0.4, 3.1.1, 3.2.3, 3.3.2, 3.3.3, 3.3.4, 3.4 + # gcc 2.7.2.3, 2.8.1, 2.95.4, egcs-1.1.2 + # 3.0.4, 3.1.1, 3.2.3, 3.3.2, 3.3.3, 3.3.4, 3.4.0, 3.4.2 + # 4.0.0 . auto/cc/gcc ;; icc) - # Intel C++ compiler 7.1, 8.0 + # Intel C++ compiler 7.1, 8.0, 8.1 . auto/cc/icc ;; ccc) -# # Compaq C V6.5-207 -# -# . auto/cc/ccc - ngx_include_opt="-I" + # Compaq C V6.5-207 + + . auto/cc/ccc ;; -# acc) -# # aCC: HP ANSI C++ B3910B A.03.55.02 -# -# . auto/cc/acc -# ;; + acc) + # aCC: HP ANSI C++ B3910B A.03.55.02 + + . auto/cc/acc + ;; msvc*) # MSVC++ 6.0 SP2, MSVC++ Toolkit 2003 @@ -87,7 +87,7 @@ else esac - CC_TEST_FLAGS=$NGX_CC_OPT + CC_TEST_FLAGS="$CC_TEST_FLAGS $NGX_CC_OPT" fi @@ -124,16 +124,20 @@ if [ "$NGX_PLATFORM" != win32 ]; then . auto/feature - ngx_feature="C99 variadic macros" - ngx_feature_name="NGX_HAVE_C99_VARIADIC_MACROS" - ngx_feature_run=yes - ngx_feature_incs="#include <stdio.h> -#define var(dummy, ...) sprintf(__VA_ARGS__)" - ngx_feature_libs= - ngx_feature_test="char buf[30]; buf[0] = '0'; - var(0, buf, \"%d\", 1); - if (buf[0] != '1') return 1" - . auto/feature + if [ $NGX_CC_NAME = 'ccc' ]; then + echo "checking for C99 variadic macros ... disabled" + else + ngx_feature="C99 variadic macros" + ngx_feature_name="NGX_HAVE_C99_VARIADIC_MACROS" + ngx_feature_run=yes + ngx_feature_incs="#include <stdio.h> +#define var(dummy, ...) sprintf(__VA_ARGS__)" + ngx_feature_libs= + ngx_feature_test="char buf[30]; buf[0] = '0'; + var(0, buf, \"%d\", 1); + if (buf[0] != '1') return 1" + . auto/feature + fi # ngx_feature="inline" |