diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-24 09:08:20 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-24 09:08:20 -0500 |
| commit | a9caa3151cea77b992c06c5a774d333ffd3016e1 (patch) | |
| tree | 330cee487295788c500bcd7096a125120a10ae75 /indra/cmake/LLCommon.cmake | |
| parent | bdd07a7a648dc7e2c290d5aa837c22c20c4af31c (diff) | |
| parent | ef1c3aac889d118530994e878d83426d4fc2ca7c (diff) | |
merge fix for storm-411
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}) |