diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-01-19 12:05:48 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-01-19 12:05:48 -0500 |
| commit | 650e6e8afb8f5e0dbf8a796941557ae2efc60d95 (patch) | |
| tree | 8619b770febb195095ddd3ff3ba75bf7bd69b464 | |
| parent | 496fa2ea87fbfa835be18f6998475175a417ea52 (diff) | |
| parent | 3b6606eed8b04783f8b80df71e4fe24f7432bde5 (diff) | |
Automated merge with https://bitbucket.org/stinson_linden/viewer-development-havokai
| -rw-r--r-- | autobuild.xml | 4 | ||||
| -rw-r--r-- | indra/cmake/LLPathingLib.cmake | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/autobuild.xml b/autobuild.xml index f71c5d3a2e..395e03554e 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1254,9 +1254,9 @@ <key>archive</key> <map> <key>hash</key> - <string>a682c345382dfc19d0e718b073e7c5b9</string> + <string>76cac9c6be702db7402623a405f7e59c</string> <key>url</key> - <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/247841/arch/Linux/installer/llpathinglibrary-0.1-linux-20120117.tar.bz2</string> + <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/248048/arch/Linux/installer/llpathinglibrary-0.1-linux-20120119.tar.bz2</string> </map> <key>name</key> <string>linux</string> 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) |