Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ld.gold on linux, useless spam

Browse Source
This commit is contained in:
Siana Gearz
2010-11-13 04:45:10 +01:00
parent e87975b8eb
commit 9dffb18c25
6 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/cmake/00-Common.cmake
View File

@@ -9,11 +9,11 @@ include(Variables)
set(CMAKE_CXX_FLAGS_DEBUG "-D_DEBUG -DLL_DEBUG=1") set(CMAKE_CXX_FLAGS_DEBUG "-D_DEBUG -DLL_DEBUG=1")
set(CMAKE_CXX_FLAGS_RELEASE set(CMAKE_CXX_FLAGS_RELEASE
"-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=1 -DNDEBUG -DSHY_MOD=1") "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=1 -DNDEBUG")
set(CMAKE_CXX_FLAGS_RELEASESSE2 set(CMAKE_CXX_FLAGS_RELEASESSE2
"-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=1 -DNDEBUG -DSHY_MOD=1") "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=1 -DNDEBUG")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
"-DLL_RELEASE=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=0 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1 -DSHY_MOD=1") "-DLL_RELEASE=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=0 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1")
# Don't bother with a MinSizeRel build. # Don't bother with a MinSizeRel build.

2
indra/linux_crash_logger/CMakeLists.txt
View File

@@ -38,7 +38,7 @@ list(APPEND linux_crash_logger_SOURCE_FILES
${linux_crash_logger_HEADER_FILES} ${linux_crash_logger_HEADER_FILES}
) )
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lrt -lapr-1 -Wl,--as-needed")
add_executable(linux-crash-logger ${linux_crash_logger_SOURCE_FILES}) add_executable(linux-crash-logger ${linux_crash_logger_SOURCE_FILES})

3
indra/llplugin/slplugin/CMakeLists.txt
View File

@@ -53,3 +53,6 @@ if (DARWIN)
) )
endif (DARWIN) endif (DARWIN)
if (LINUX)
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lrt")
endif (LINUX)

2
indra/llxml/llcontrol.cpp
View File

@@ -66,7 +66,7 @@ const S32 CURRENT_VERSION = 101;
//So, a global it is! //So, a global it is!
bool gCOAEnabled = false; bool gCOAEnabled = false;
inline LLControlVariable *LLControlVariable::getCOAActive() LLControlVariable *LLControlVariable::getCOAActive()
{ {
//if no coa connection, return 'this' //if no coa connection, return 'this'
//if per account is ON and this IS a parent, return child var //if per account is ON and this IS a parent, return child var

2
indra/newview/CMakeLists.txt
View File

@@ -1013,7 +1013,7 @@ endif (DARWIN)
if (LINUX) if (LINUX)
LIST(APPEND viewer_SOURCE_FILES llappviewerlinux.cpp) LIST(APPEND viewer_SOURCE_FILES llappviewerlinux.cpp)
LIST(APPEND viewer_SOURCE_FILES llappviewerlinux_api_dbus.cpp) LIST(APPEND viewer_SOURCE_FILES llappviewerlinux_api_dbus.cpp)
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed") SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -luuid -lrt -laprutil-1 -lfontconfig -Wl,--as-needed")
set(viewer_LIBRARIES set(viewer_LIBRARIES
Xinerama Xinerama

2
indra/newview/llvoavatar.cpp
View File

@@ -3594,7 +3594,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
} }
else else
{ {
llinfos << "Using Emerald-style client identifier." << llendl; //llinfos << "Using Emerald-style client identifier." << llendl;
//The old client identification. Used only if the new method doesn't exist, so that it isn't automatically overwritten. -HgB //The old client identification. Used only if the new method doesn't exist, so that it isn't automatically overwritten. -HgB
getClientInfo(mClientTag,mClientColor); getClientInfo(mClientTag,mClientColor);
if(mClientTag == "") if(mClientTag == "")