diff options
author | Andrew Meadows <andrew@lindenlab.com> | 2010-12-29 12:39:58 -0800 |
---|---|---|
committer | Andrew Meadows <andrew@lindenlab.com> | 2010-12-29 12:39:58 -0800 |
commit | d12b7b347ad4094b96ba2a650ae86dfb9db2a893 (patch) | |
tree | 1646c252edd36b31cf4ed3efaac0b91995f631e0 /indra/cmake/LLCommon.cmake | |
parent | 98b2f622b709fcacac32e8ad23b8da6479a28a87 (diff) | |
parent | 087c105317058dc3a011c937a5aceaf87fdecc26 (diff) |
merge
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}) |