summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2012-01-19 12:05:48 -0500
committerNyx (Neal Orman) <nyx@lindenlab.com>2012-01-19 12:05:48 -0500
commit650e6e8afb8f5e0dbf8a796941557ae2efc60d95 (patch)
tree8619b770febb195095ddd3ff3ba75bf7bd69b464 /indra
parent496fa2ea87fbfa835be18f6998475175a417ea52 (diff)
parent3b6606eed8b04783f8b80df71e4fe24f7432bde5 (diff)
Automated merge with https://bitbucket.org/stinson_linden/viewer-development-havokai
Diffstat (limited to 'indra')
-rw-r--r--indra/cmake/LLPathingLib.cmake5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/cmake/LLPathingLib.cmake b/indra/cmake/LLPathingLib.cmake
index c108b33e8c..8e622d83db 100644
--- a/indra/cmake/LLPathingLib.cmake
+++ b/indra/cmake/LLPathingLib.cmake
@@ -16,3 +16,8 @@ set(LLPATHING_LIBRARIES
debug ${LL_PATHING_DEBUG_LIB}
optimized ${LL_PATHING_RELEASE_LIB}
)
+
+if (LINUX)
+ list(INSERT LLPATHING_LIBRARIES 0 -Wl,--start-group)
+ list(APPEND LLPATHING_LIBRARIES -Wl,--end-group)
+endif (LINUX)