diff options
| author | Aleric Inglewood <Aleric.Inglewood@gmail.com> | 2010-12-15 20:55:10 +0100 |
|---|---|---|
| committer | Aleric Inglewood <Aleric.Inglewood@gmail.com> | 2010-12-15 20:55:10 +0100 |
| commit | 86380bb177b9e18e345bc302efb3a84b2c5758a9 (patch) | |
| tree | a7a45fa4370a51ca13a12bdd1d350de4898bc6d9 /indra/cmake/BerkeleyDB.cmake | |
| parent | 3f5d67bcb751858c20121e1f85a63a447ed13903 (diff) | |
VWR-24254: Add support for using ld.gold on linux.
To use ld.gold configure with:
-DCMAKE_EXE_LINKER_FLAGS:STRING="-Wl,-use-gold".
ld.gold links the viewer on my machine in 8 seconds, as
opposed to 19 seconds with ld.bfd. Moreover, it uses a
LOT less memory during linking (about 750 MB instead of
2.5 GB!).
VWR-24254: Don't link with fontconfig on non-linux.
While we already added fontconfig in the above patch,
that code turned out to also be used by Windows and
Darwin (contrary to the comments in the code).
After looking at the history of commits and a
discussion on IRC it was decided that the original
coder (Kyle Ambroff <ambroff@lindenlab.com>) really
meant (LINUX AND VIEWER) instead of (NOT LINUX OR VIEWER).
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) |