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/BerkeleyDB.cmake | |
| parent | bdd07a7a648dc7e2c290d5aa837c22c20c4af31c (diff) | |
| parent | ef1c3aac889d118530994e878d83426d4fc2ca7c (diff) | |
merge fix for storm-411
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) |