diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-06 14:33:35 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-06 14:33:35 -0500 |
commit | 894e98a708f4135cb4543b95ce46c2b8c4929393 (patch) | |
tree | 2055d289ca6c55eacb300feddb38b2935e8ae132 /indra/cmake/LLPlugin.cmake | |
parent | 1ca028cd7b2b4a169cdc776dfa4b38b2fcb76440 (diff) | |
parent | 94fbf99ac2e325a75a016e2f4c3b12cf8c82fc7c (diff) |
merge changes for storm-812
Diffstat (limited to 'indra/cmake/LLPlugin.cmake')
-rw-r--r-- | indra/cmake/LLPlugin.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/cmake/LLPlugin.cmake b/indra/cmake/LLPlugin.cmake index 9722f16c3c..7ee404b9bd 100644 --- a/indra/cmake/LLPlugin.cmake +++ b/indra/cmake/LLPlugin.cmake @@ -5,4 +5,10 @@ set(LLPLUGIN_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llplugin ) -set(LLPLUGIN_LIBRARIES llplugin) +if (LINUX) + # In order to support using ld.gold on linux, we need to explicitely + # specify all libraries that llplugin uses. + set(LLPLUGIN_LIBRARIES llplugin pthread) +else (LINUX) + set(LLPLUGIN_LIBRARIES llplugin) +endif (LINUX) |