diff options
| author | Aura Linden <aura@lindenlab.com> | 2014-08-18 13:02:20 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2014-08-18 13:02:20 -0700 |
| commit | f5181b03bbb99d4ca57d9f5f3a939c3b4e9a2243 (patch) | |
| tree | 45397995d48776ec92b1f707016a0228dbbe862b /indra/cmake/ZLIB.cmake | |
| parent | b12e241751bef94cecb99e5577f1a75f0cbe2147 (diff) | |
| parent | b021c90e7bccdd0f9a916946e7716a00034254c2 (diff) | |
Pulled merge from release
Diffstat (limited to 'indra/cmake/ZLIB.cmake')
| -rwxr-xr-x | indra/cmake/ZLIB.cmake | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/indra/cmake/ZLIB.cmake b/indra/cmake/ZLIB.cmake index b99a8644c9..6cff0753b2 100755 --- a/indra/cmake/ZLIB.cmake +++ b/indra/cmake/ZLIB.cmake @@ -13,10 +13,23 @@ else (USESYSTEMLIBS) set(ZLIB_LIBRARIES debug zlibd optimized zlib) - else (WINDOWS) + elseif (LINUX) + # + # When we have updated static libraries in competition with older + # shared libraries and we want the former to win, we need to do some + # extra work. The *_PRELOAD_ARCHIVES settings are invoked early + # and will pull in the entire archive to the binary giving it + # priority in symbol resolution. Beware of cmake moving the + # achive load itself to another place on the link command line. If + # that happens, you can try something like -Wl,-lz here to hide + # the archive. Also be aware that the linker will not tolerate a + # second whole-archive load of the archive. See viewer's + # CMakeLists.txt for more information. + # + set(ZLIB_PRELOAD_ARCHIVES -Wl,--whole-archive z -Wl,--no-whole-archive) + set(ZLIB_LIBRARIES z) + elseif (DARWIN) set(ZLIB_LIBRARIES z) endif (WINDOWS) - if (WINDOWS OR LINUX) - set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/zlib) - endif (WINDOWS OR LINUX) + set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/zlib) endif (USESYSTEMLIBS) |