diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:46:09 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:46:09 -0500 |
commit | e2f197b6f77592c84d0c2967cc0e8110c79f2f49 (patch) | |
tree | c405316265ca4248802817b8a99697063c58469d /indra/cmake/LLPlugin.cmake | |
parent | 2d9c970babf6bab8d402482315af6be0ffb198dd (diff) | |
parent | 78895f9e0c628dc33268578faf135e967cf30142 (diff) |
merge changes for storm-398
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) |