diff -r 422f636c3343 doc/contributions.txt
--- a/doc/contributions.txt	Fri Jan 14 10:28:29 2011 -0800
+++ b/doc/contributions.txt	Fri Jan 14 21:06:18 2011 +0100
@@ -79,6 +79,7 @@
 	VWR-24252
 	VWR-24254
 	VWR-24261
+	VWR-24366
 	SNOW-84
 	SNOW-477
 	SNOW-744
diff -r 422f636c3343 indra/cmake/GoogleMock.cmake
--- a/indra/cmake/GoogleMock.cmake	Fri Jan 14 10:28:29 2011 -0800
+++ b/indra/cmake/GoogleMock.cmake	Fri Jan 14 21:06:18 2011 +0100
@@ -8,9 +8,10 @@
     ${LIBS_PREBUILT_DIR}/include)
 
 if (LINUX)
+    # VWR-24366: gmock is underlinked, it needs gtest.
     set(GOOGLEMOCK_LIBRARIES 
-        gmock  
-        gtest)
+        gmock -Wl,--no-as-needed
+        gtest -Wl,--as-needed)
 elseif(WINDOWS)
     set(GOOGLEMOCK_LIBRARIES 
         gmock)
diff -r 422f636c3343 indra/cmake/LLAddBuildTest.cmake
--- a/indra/cmake/LLAddBuildTest.cmake	Fri Jan 14 10:28:29 2011 -0800
+++ b/indra/cmake/LLAddBuildTest.cmake	Fri Jan 14 21:06:18 2011 +0100
@@ -57,11 +57,6 @@
     ${CMAKE_SOURCE_DIR}/test/test.h
     )
 
-  # Use the default flags
-  if (LINUX)
-    SET(CMAKE_EXE_LINKER_FLAGS "")
-  endif (LINUX)
-
   # start the source test executable definitions
   SET(${project}_TEST_OUTPUT "")
   FOREACH (source ${sources})