Mercurial > hg > nginx
annotate auto/cc/bcc @ 5041:7a6fbac9f3e3 stable-1.2
Merge of r4961: configure: better check for PCRE JIT.
On Mac OS X system toolchain by default prefers include files
from /usr/local/include, but libraries from /usr/lib. This might result in
various problems, in particular the one outlined below.
If the PCRE library is installed into /usr/local/, this results in pcre.h
being used from /usr/local/include (with PCRE_CONFIG_JIT defined), but
libpcre from /usr/lib (as shipped with the OS, without pcre_free_study()
symbol). As a result build fails as we use pcre_free_study() function
if we try to compile with PCRE JIT support.
Obvious workaround to the root cause is to ask compiler to prefer
library from /usr/local/lib via ./configure --with-ld-opt="-L/usr/local/lib".
On the other hand, in any case it would be good to check if the function
we are going to use is available, hence the change.
See thread here for details:
http://mailman.nginx.org/pipermail/nginx-devel/2012-December/003074.html
Prodded by Piotr Sikora.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Sun, 10 Feb 2013 03:18:08 +0000 |
| parents | d620f497c50f |
| children | b7b7f3a0cc28 |
| rev | line source |
|---|---|
| 455 | 1 |
| 2 # Copyright (C) Igor Sysoev | |
| 4412 | 3 # Copyright (C) Nginx, Inc. |
| 455 | 4 |
| 5 | |
| 6 # Borland C++ 5.5 | |
| 7 | |
| 8 # optimizations | |
| 9 | |
| 10 # maximize speed | |
| 11 CFLAGS="$CFLAGS -O2" | |
| 12 | |
| 13 case $CPU in | |
| 14 pentium) | |
| 15 # optimize for Pentium and Athlon | |
| 16 CPU_OPT="-5" | |
| 17 ;; | |
| 18 | |
| 19 pentiumpro) | |
| 20 # optimize for Pentium Pro, Pentium II and Pentium III | |
| 21 CPU_OPT="-6" | |
| 22 ;; | |
| 23 esac | |
| 24 | |
| 503 | 25 # __stdcall |
| 26 #CPU_OPT="$CPU_OPT -ps" | |
| 27 # __fastcall | |
|
2712
41f993457021
OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents:
795
diff
changeset
|
28 #CPU_OPT="$CPU_OPT -pr" |
| 503 | 29 |
| 455 | 30 CFLAGS="$CFLAGS $CPU_OPT" |
| 31 | |
| 32 # multithreaded | |
| 33 CFLAGS="$CFLAGS -tWM" | |
| 34 | |
| 35 # stop on warning | |
| 36 CFLAGS="$CFLAGS -w!" | |
| 37 | |
| 38 # disable logo | |
| 39 CFLAGS="$CFLAGS -q" | |
| 40 | |
| 461 | 41 |
| 455 | 42 # precompiled headers |
| 795 | 43 CORE_DEPS="$CORE_DEPS $NGX_OBJS/ngx_config.csm" |
| 44 NGX_PCH="$NGX_OBJS/ngx_config.csm" | |
| 45 NGX_BUILD_PCH="-H=$NGX_OBJS/ngx_config.csm" | |
| 46 NGX_USE_PCH="-Hu -H=$NGX_OBJS/ngx_config.csm" | |
| 455 | 47 |
| 461 | 48 |
| 49 # Win32 GUI mode application | |
| 2725 | 50 #LINK="\$(CC) -laa" |
| 461 | 51 |
| 52 | |
| 53 # the resource file | |
| 469 | 54 NGX_RES="$NGX_OBJS/nginx.res" |
| 55 NGX_RCC="brcc32 -fo$NGX_OBJS/nginx.res \$(CORE_INCS) $NGX_WIN32_RC" | |
| 461 | 56 # the pragma allows to link the resource file using bcc32 and |
| 57 # to avoid the direct ilink32 calling and the c0w32.obj's WinMain/main problem | |
| 469 | 58 NGX_PRAGMA="#pragma resource \"$NGX_OBJS/nginx.res\"" |
| 461 | 59 |
| 455 | 60 |
| 61 ngx_include_opt="-I" | |
| 62 ngx_objout="-o" | |
| 63 ngx_binout="-e" | |
| 64 ngx_objext="obj" | |
| 65 ngx_binext=".exe" | |
| 461 | 66 |
| 573 | 67 ngx_long_start='@&&| |
| 68 ' | |
| 69 ngx_long_end='|' | |
| 70 | |
| 461 | 71 ngx_regex_dirsep='\\' |
| 72 ngx_dirsep="\\" |