diff options
author | Oz Linden <oz@lindenlab.com> | 2010-12-24 07:41:41 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-12-24 07:41:41 -0500 |
commit | 14d830ca43a7114140ebeb16a76829db4d21a95b (patch) | |
tree | 169ab24a903d59c762259810de684f1dcb8c4186 /indra/cmake/LLPlugin.cmake | |
parent | 551bfb88fce8a9cd6faac440e3d89d79213550ed (diff) | |
parent | 5a4bb72b8d37ca51deb84e1490fdefe2908d2d59 (diff) |
merge improved fix for STORM_785
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) |