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/LLCommon.cmake | |
| parent | 551bfb88fce8a9cd6faac440e3d89d79213550ed (diff) | |
| parent | 5a4bb72b8d37ca51deb84e1490fdefe2908d2d59 (diff) | |
merge improved fix for STORM_785
Diffstat (limited to 'indra/cmake/LLCommon.cmake')
| -rw-r--r-- | indra/cmake/LLCommon.cmake | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake index d1ab264a41..17e211cb99 100644 --- a/indra/cmake/LLCommon.cmake +++ b/indra/cmake/LLCommon.cmake @@ -13,7 +13,14 @@ set(LLCOMMON_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ) -set(LLCOMMON_LIBRARIES llcommon) +if (LINUX) + # In order to support using ld.gold on linux, we need to explicitely + # specify all libraries that llcommon uses. + # llcommon uses `clock_gettime' which is provided by librt on linux. + set(LLCOMMON_LIBRARIES llcommon rt) +else (LINUX) + set(LLCOMMON_LIBRARIES llcommon) +endif (LINUX) add_definitions(${TCMALLOC_FLAG}) |