# HG changeset patch # User Igor Sysoev # Date 1184527066 0 # Node ID 811fb97b9bf7fd0b805519bd50ad216cc1767267 # Parent 56af40ef3a08cac204f9dd1698fea8351c123b6b fix building PCRE by SunStudio diff --git a/auto/cc/sunc b/auto/cc/sunc --- a/auto/cc/sunc +++ b/auto/cc/sunc @@ -36,7 +36,7 @@ case "$NGX_MACHINE" in sun4u | sun4v) # "-xarch=v9" enables the "casa" assembler instruction - CFLAGS="$CFLAGS -xarch=v9" + CPU_OPT="-xarch=v9" CORE_LINK="$CORE_LINK -xarch=v9" NGX_AUX=" src/os/unix/ngx_sunpro_sparc64.il" ;; diff --git a/auto/lib/pcre/conf b/auto/lib/pcre/conf --- a/auto/lib/pcre/conf +++ b/auto/lib/pcre/conf @@ -17,7 +17,7 @@ if [ $PCRE != NONE ]; then CORE_LIBS="$CORE_LIBS $PCRE/pcre.lib" ;; - icc* | sunc ) + icc* ) have=NGX_PCRE . auto/have CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"