diff options
author | callum <none@none> | 2011-01-05 15:52:43 -0800 |
---|---|---|
committer | callum <none@none> | 2011-01-05 15:52:43 -0800 |
commit | b9ca6c553cf158c5b485947f8b560228a196c1d7 (patch) | |
tree | df710eb467a1c0fbfb5d7906232f23a36f6fc7c1 /indra/cmake/LLCommon.cmake | |
parent | ed3ea14984e322462ed466805e47b29a6f658279 (diff) | |
parent | d5a0c56bf5d933b7cee072cbc1851a626e672ded (diff) |
Merge with viewer-development
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}) |