3 files changed, 9 insertions, 8 deletions

diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 8c6ca2d..9b3f423 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -112,15 +112,16 @@ if (LINUX)
     endif (NOT ${GXX_VERSION} MATCHES " 4.1.*Red Hat")
   endif (${GXX_VERSION} STREQUAL ${CXX_VERSION})
 
-  # GCC 4.3 introduces a pile of obnoxious new warnings, which we
-  # treat as errors due to -Werror.  Quiet the most offensive and
-  # widespread of them.
 
-  if (${CXX_VERSION} MATCHES "4.3")
-    add_definitions(-Wno-deprecated -Wno-parentheses)
-  endif (${CXX_VERSION} MATCHES "4.3")
+  # Silence certain types of compiler warnings, to prevent them from
+  # breaking compile (due to -Werror treating them as errors).
+
+  add_definitions(
+    -Wno-deprecated
+    -Wno-parentheses
+    -Wno-unused-variable
+    )
 
-  # End of hacks.
 
   add_definitions(
       -DLL_LINUX=1
diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index 992b61e..55a8f43 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -97,6 +97,7 @@ else (WINDOWS)
 
   else (DARWIN) # Linux
 
+    use_prebuilt_binary(liboil)
     use_prebuilt_binary(theora)
 
     set(GSTREAMER_LIBRARIES
diff --git a/linden/indra/cmake/ViewerMiscLibs.cmake b/linden/indra/cmake/ViewerMiscLibs.cmake
index 68ee881..2a8abda 100644
--- a/linden/indra/cmake/ViewerMiscLibs.cmake
+++ b/linden/indra/cmake/ViewerMiscLibs.cmake
@@ -2,7 +2,6 @@
 include(Prebuilt)
 
 if (NOT STANDALONE)
-  use_prebuilt_binary(libstdc++)
   use_prebuilt_binary(libuuid)
   use_prebuilt_binary(vivox)
   use_prebuilt_binary(fontconfig)