diff options
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/cc/icc | 6 | ||||
| -rw-r--r-- | auto/lib/perl/make | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/auto/cc/icc b/auto/cc/icc index 81b042748..afcabe6e6 100644 --- a/auto/cc/icc +++ b/auto/cc/icc @@ -20,9 +20,6 @@ CFLAGS="$CFLAGS -O" # inline any function, at the compiler's discretion CFLAGS="$CFLAGS -Ob2" -# single-file IP optimizations -#IPO="-ip" - # multi-file IP optimizations case "$NGX_ICC_VER" in 9.*) @@ -34,6 +31,9 @@ case "$NGX_ICC_VER" in ;; esac +# single-file IP optimizations +#IPO="-ip" + CFLAGS="$CFLAGS $IPO" CORE_LINK="$CORE_LINK $IPO" CORE_LINK="$CORE_LINK -opt_report_file=$NGX_OBJS/opt_report_file" diff --git a/auto/lib/perl/make b/auto/lib/perl/make index 36544223a..b7c8cb3bd 100644 --- a/auto/lib/perl/make +++ b/auto/lib/perl/make @@ -15,14 +15,16 @@ $NGX_OBJS/src/http/modules/perl/blib/arch/auto/nginx/nginx.so: \ cd $NGX_OBJS/src/http/modules/perl && make -$NGX_OBJS/src/http/modules/perl/Makefile: src/http/modules/perl/Makefile.PL +$NGX_OBJS/src/http/modules/perl/Makefile: \ + src/http/modules/perl/Makefile.PL \ + src/http/modules/perl/nginx.pm cp -p src/http/modules/perl/nginx.* $NGX_OBJS/src/http/modules/perl/ cp -p src/http/modules/perl/typemap $NGX_OBJS/src/http/modules/perl/ cp -p src/http/modules/perl/Makefile.PL $NGX_OBJS/src/http/modules/perl/ cd $NGX_OBJS/src/http/modules/perl \ - && NGX_PERL_CFLAGS="$NGX_PERL_CFLAGS" \ + && NGX_PERL_CFLAGS="$NGX_PERL_CFLAGS $NGX_CC_OPT" \ NGX_PCRE=$PCRE \ NGX_ZLIB=$ZLIB \ NGX_OBJS=$NGX_OBJS \ |