From bd69aa7be2aa23c991278c80f1ad6a339a541ff9 Mon Sep 17 00:00:00 2001
From: Rider Linden <none@none>
Date: Thu, 2 Apr 2015 15:58:24 -0700
Subject: Linux linker order.

---
 indra/llmessage/CMakeLists.txt | 9 ---------
 indra/newview/CMakeLists.txt   | 6 ++++--
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt
index 56bcf76ee8..f6ca6a3634 100755
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -245,18 +245,9 @@ if (LL_TESTS)
 
   
   #    set(TEST_DEBUG on)
-if (LINUX)	
-  # llcommon uses `clock_gettime' which is provided by librt on linux.
-  set(LIBRT_LIBRARY
-    rt
-	)
-#else 
-	set (LIBRT_LIBRARY )
-endif (LINUX)
   
   set(test_libs
     ${WINDOWS_LIBRARIES}
-	${LIBRT_LIBRARY}
     ${LLVFS_LIBRARIES}
     ${LLMATH_LIBRARIES}
     ${CURL_LIBRARIES}
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 8c5bc9777c..7a6bf0a5bf 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2329,15 +2329,17 @@ if (LL_TESTS)
     )
 
   set(test_libs
-    ${LLMESSAGE_LIBRARIES}
-    ${LLCOREHTTP_LIBRARIES}
     ${WINDOWS_LIBRARIES}
     ${LLVFS_LIBRARIES}
     ${LLMATH_LIBRARIES}
     ${LLCOMMON_LIBRARIES}
+    ${LLMESSAGE_LIBRARIES}
+    ${LLCOREHTTP_LIBRARIES}
     ${GOOGLEMOCK_LIBRARIES}
     ${OPENSSL_LIBRARIES}
     ${CRYPTO_LIBRARIES}
+    ${BOOST_CONTEXT_LIBRARY}
+    ${BOOST_COROUTINE_LIBRARY}
   )
 
     LL_ADD_INTEGRATION_TEST(llsechandler_basic
-- 
cgit v1.2.3