--- linden/indra/cmake/00-Common.cmake	2009-07-05 10:48:46.193849602 +0200
+++ linden/indra/cmake/00-Common.cmake	2009-07-05 10:52:44.820495068 +0200
@@ -165,7 +165,7 @@
   endif (VIEWER)
 
   set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}")
-  set(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CMAKE_CXX_FLAGS_RELEASE}")
+  #set(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CMAKE_CXX_FLAGS_RELEASE}")
 endif (LINUX)
 
 
@@ -207,9 +207,9 @@
 if (STANDALONE)
   add_definitions(-DLL_STANDALONE=1)
 
-  if (LINUX AND ${ARCH} STREQUAL "i686")
-    add_definitions(-march=pentiumpro)
-  endif (LINUX AND ${ARCH} STREQUAL "i686")
+  #if (LINUX AND ${ARCH} STREQUAL "i686")
+  #  add_definitions(-march=pentiumpro)
+  #endif (LINUX AND ${ARCH} STREQUAL "i686")
 
 else (STANDALONE)
   set(${ARCH}_linux_INCLUDES
--- linden/indra/linux_crash_logger/CMakeLists.txt	2009-07-05 10:28:03.167309608 +0200
+++ linden/indra/linux_crash_logger/CMakeLists.txt	2009-07-05 10:35:34.134166255 +0200
@@ -38,7 +38,7 @@
      ${linux_crash_logger_HEADER_FILES}
      )
 
-list(APPEND CMAKE_EXE_LINKER_FLAGS -Wl,--as-needed)
+SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
 
 add_executable(linux-crash-logger ${linux_crash_logger_SOURCE_FILES})
 
--- linden/indra/newview/CMakeLists.txt	2009-07-05 12:53:34.346434928 +0200
+++ linden/indra/newview/CMakeLists.txt	2009-07-05 12:54:24.229760762 +0200
@@ -914,7 +914,7 @@
 if (LINUX)
     LIST(APPEND viewer_SOURCE_FILES llappviewerlinux.cpp)
     LIST(APPEND viewer_SOURCE_FILES llappviewerlinux_api_dbus.cpp)
-    LIST(APPEND CMAKE_EXE_LINKER_FLAGS -Wl,--as-needed)
+    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
 
     set(viewer_LIBRARIES
         Xinerama