diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-03-14 20:46:25 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-03-14 20:46:25 +0000 |
| commit | 3646a1669df23e2dcfb7cc8c940abeb822d8f010 (patch) | |
| tree | 3fa72a0986c1bbb70eb393a0073c117bb82dcd54 /auto/lib/zlib | |
| parent | 67f88e9cc678d31b5995518922d3fcb63a129465 (diff) | |
| download | nginx-3646a1669df23e2dcfb7cc8c940abeb822d8f010.tar.gz nginx-3646a1669df23e2dcfb7cc8c940abeb822d8f010.tar.bz2 | |
nginx-0.0.2-2004-03-14-23:46:25 import
Diffstat (limited to 'auto/lib/zlib')
| -rw-r--r-- | auto/lib/zlib/conf | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/auto/lib/zlib/conf b/auto/lib/zlib/conf index a779b21b6..754231221 100644 --- a/auto/lib/zlib/conf +++ b/auto/lib/zlib/conf @@ -15,6 +15,21 @@ if [ $ZLIB != NONE ]; then CORE_LIBS="$CORE_LIBS $ZLIB/zlib.lib" ;; + *icc) + LINK_DEPS="$LINK_DEPS $ZLIB/libz.a" + + # to allow -ipo optimization we link with the *.o but not library + CORE_LIBS="$CORE_LIBS $ZLIB/adler32.o" + CORE_LIBS="$CORE_LIBS $ZLIB/crc32.o" + CORE_LIBS="$CORE_LIBS $ZLIB/deflate.o" + CORE_LIBS="$CORE_LIBS $ZLIB/trees.o" + CORE_LIBS="$CORE_LIBS $ZLIB/zutil.o" + + if [ $ZLIB_ASM != NO ]; then + CORE_LIBS="$CORE_LIBS $ZLIB/match.o" + fi + ;; + *) LINK_DEPS="$LINK_DEPS $ZLIB/libz.a" CORE_LIBS="$CORE_LIBS -L $ZLIB -lz" |