diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-01-19 12:04:42 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-01-19 12:04:42 -0500 |
| commit | 3b6606eed8b04783f8b80df71e4fe24f7432bde5 (patch) | |
| tree | ddee4bc4479be8610717a3fceabbe9cb431751fd /indra | |
| parent | 8cf6b9cb929ff37fc6febe1f4ede4efa526260d9 (diff) | |
PATH-180 FIX? updating to latest pathing lib, and ensuring order invariance
Grabbing latest packaged pathing library, and adding linker flags to
deal with circular dependencies.`
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/LLPathingLib.cmake | 5 |
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) |