diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:43:26 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:43:26 -0500 |
commit | 05810f063dbe0ed87d03ea41c7d8fdc423945c6e (patch) | |
tree | 311355a1679ef47fa1951788319e0c521a188edd /indra/cmake/LLPlugin.cmake | |
parent | 5e376017858f6534163b0bfb6b385bdd0aeac5d3 (diff) | |
parent | e4591a85182133811e327b579c558bb3db80d79e (diff) |
merge changes for storm-737
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) |