diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-06 14:31:17 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-06 14:31:17 -0500 |
| commit | a9686db3e606ec45d23265fd34a1a35498f39857 (patch) | |
| tree | b20758ac0beda679834eafbcdd203780449be334 /indra/cmake/BerkeleyDB.cmake | |
| parent | 7105d98e24185f9ce31be1fe1b26c3ae1552e71f (diff) | |
| parent | 1034db639462d95e54e9bf9e4d63500b745bb0a2 (diff) | |
merge changes for storm-438
Diffstat (limited to 'indra/cmake/BerkeleyDB.cmake')
| -rw-r--r-- | indra/cmake/BerkeleyDB.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/cmake/BerkeleyDB.cmake b/indra/cmake/BerkeleyDB.cmake index d98e79179d..e3ca0fd77d 100644 --- a/indra/cmake/BerkeleyDB.cmake +++ b/indra/cmake/BerkeleyDB.cmake @@ -6,6 +6,11 @@ set(DB_FIND_REQUIRED ON) if (STANDALONE) include(FindBerkeleyDB) else (STANDALONE) - set(DB_LIBRARIES db-4.2) + if (LINUX) + # Need to add dependency pthread explicitely to support ld.gold. + set(DB_LIBRARIES db-4.2 pthread) + else (LINUX) + set(DB_LIBRARIES db-4.2) + endif (LINUX) set(DB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) endif (STANDALONE) |