diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:43:26 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:43:26 -0500 |
| commit | 05810f063dbe0ed87d03ea41c7d8fdc423945c6e (patch) | |
| tree | 311355a1679ef47fa1951788319e0c521a188edd /indra/cmake/LLCommon.cmake | |
| parent | 5e376017858f6534163b0bfb6b385bdd0aeac5d3 (diff) | |
| parent | e4591a85182133811e327b579c558bb3db80d79e (diff) | |
merge changes for storm-737
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}) |