diff --git a/autobuild.xml b/autobuild.xml index f71c5d3a2e..395e03554e 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1254,9 +1254,9 @@ archive hash - a682c345382dfc19d0e718b073e7c5b9 + 76cac9c6be702db7402623a405f7e59c url - 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 + 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 name linux 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)