diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 0e07d2f11c207cbe941cb8164d7749cdc65f60c0..dc1885b7593e42f81ef50fdb651f0c73e1c68ecb 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -39,22 +39,22 @@ if (WINDOWS)
 	)
 elseif (LINUX)
   target_link_libraries( ll::boost INTERFACE
-        optimized boost_fiber-mt${addrsfx}
-        debug boost_fiber-mt${addrsfx}-d
-        optimized boost_context-mt${addrsfx}
-        debug boost_context-mt${addrsfx}-d
-        optimized boost_filesystem-mt${addrsfx}
-        debug boost_filesystem-mt${addrsfx}-d
-        optimized boost_program_options-mt${addrsfx}
-        debug boost_program_options-mt${addrsfx}-d
-        optimized boost_regex-mt${addrsfx}
-        debug boost_regex-mt${addrsfx}-d
-        optimized boost_thread-mt${addrsfx}
-        debug boost_thread-mt${addrsfx}-d
-        optimized boost_wave-mt${addrsfx}
-        debug boost_wave-mt${addrsfx}-d
-        optimized boost_system-mt${addrsfx}
-        debug boost_system-mt${addrsfx}-d
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_fiber-mt${addrsfx}.a
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libboost_fiber-mt-d${addrsfx}.a
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_context-mt${addrsfx}.a
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libboost_context-mt-d${addrsfx}.a
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_filesystem-mt${addrsfx}.a
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libboost_filesystem-mt-d${addrsfx}.a
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_program_options-mt${addrsfx}.a
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libboost_program_options-mt-d${addrsfx}.a
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_regex-mt${addrsfx}.a
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libboost_regex-mt-d${addrsfx}.a
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_thread-mt${addrsfx}.a
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libboost_thread-mt-d${addrsfx}.a
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_wave-mt${addrsfx}.a
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libboost_wave-mt-d${addrsfx}.a
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_system-mt${addrsfx}.a
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libboost_system-mt-d${addrsfx}.a
         rt
 	)
 elseif (DARWIN)
diff --git a/indra/cmake/LibXML2.cmake b/indra/cmake/LibXML2.cmake
index 47426e7f0ce4dda2c283c2b5534f8a6603b55239..d138c74a6f05744582bb417b783bcc0256e41343 100644
--- a/indra/cmake/LibXML2.cmake
+++ b/indra/cmake/LibXML2.cmake
@@ -19,7 +19,10 @@ if (WINDOWS)
 elseif(DARWIN)
     target_link_libraries( ll::libxml2 INTERFACE xml2 iconv)
 else()
-    target_link_libraries( ll::libxml2 INTERFACE xml2)
+    target_link_libraries( ll::libxml2 INTERFACE 
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libxml2.a
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libxml2.a
+    )
 endif()
 
 target_include_directories( ll::libxml2 SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/libxml2)
diff --git a/indra/cmake/NGHTTP2.cmake b/indra/cmake/NGHTTP2.cmake
index 3d0279d210fb930913df61b0efdfa7eb7bf51978..aa042e5abb6bdeb46360cf865ee3ce04e822f759 100644
--- a/indra/cmake/NGHTTP2.cmake
+++ b/indra/cmake/NGHTTP2.cmake
@@ -11,9 +11,15 @@ if (WINDOWS)
       debug ${ARCH_PREBUILT_DIRS_DEBUG}/nghttp2.lib
       optimized ${ARCH_PREBUILT_DIRS_RELEASE}/nghttp2.lib
   )
-elseif (DARWIN)
-  target_link_libraries( ll::nghttp2 INTERFACE libnghttp2.a)
-else (WINDOWS)
-  target_link_libraries( ll::nghttp2 INTERFACE libnghttp2.a )
-endif (WINDOWS)
+elseif (LINUX)
+  target_link_libraries( ll::nghttp2 INTERFACE 
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libnghttp2.a
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libnghttp2.a
+  )
+else ()
+  target_link_libraries( ll::nghttp2 INTERFACE 
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libnghttp2.a
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libnghttp2.a
+  )
+endif ()
 target_include_directories( ll::nghttp2 SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/nghttp2)
diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake
index 691b2d3169bbfc51ae9622fe331f8c1be1528015..bc5b2e15ca46dba258aff151099dc24d7b3ef5d2 100644
--- a/indra/cmake/OpenSSL.cmake
+++ b/indra/cmake/OpenSSL.cmake
@@ -15,7 +15,13 @@ if (WINDOWS)
         Crypt32.lib
   )
 elseif (LINUX)
-  target_link_libraries(ll::openssl INTERFACE ssl crypto dl)
+  target_link_libraries(ll::openssl INTERFACE 
+    debug ${ARCH_PREBUILT_DIRS_DEBUG}/libssl.a
+    optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libssl.a
+    debug ${ARCH_PREBUILT_DIRS_DEBUG}/libcrypto.a
+    optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libcrypto.a
+    dl
+  )
 else()
   target_link_libraries(ll::openssl INTERFACE ssl crypto)
 endif (WINDOWS)
diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake
index 4c245d2153d28345d9dbbb0aaabd93465c12ba35..f9c1ca77f3524f0d8cf3b384884dbe3824c4a9ed 100644
--- a/indra/cmake/PNG.cmake
+++ b/indra/cmake/PNG.cmake
@@ -12,6 +12,11 @@ if (WINDOWS)
         debug ${ARCH_PREBUILT_DIRS_DEBUG}/libpng16d.lib
         optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libpng16.lib
         )
+elseif(LINUX)
+  target_link_libraries(ll::libpng INTERFACE
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libpng16d.a
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libpng16.a
+        )
 else()
   target_link_libraries(ll::libpng INTERFACE png16 )
 endif()
diff --git a/indra/cmake/URIPARSER.cmake b/indra/cmake/URIPARSER.cmake
index cd5d9e598fbb10bac807ce462fdc2253c22897f1..d4f23507f3881592b9c53ec4db24eda32c1af0de 100644
--- a/indra/cmake/URIPARSER.cmake
+++ b/indra/cmake/URIPARSER.cmake
@@ -15,7 +15,9 @@ if (WINDOWS)
         debug ${ARCH_PREBUILT_DIRS_DEBUG}/uriparser.lib
         optimized ${ARCH_PREBUILT_DIRS_RELEASE}/uriparser.lib)
 elseif (LINUX)
-    target_link_libraries( ll::uriparser INTERFACE uriparser)
+    target_link_libraries( ll::uriparser INTERFACE 
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/liburiparser.a
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/liburiparser.a)
 elseif (DARWIN)
     target_link_libraries( ll::uriparser INTERFACE liburiparser.dylib)
 endif (WINDOWS)
diff --git a/indra/cmake/ZLIBNG.cmake b/indra/cmake/ZLIBNG.cmake
index 4564d199d8377ebc1e6345fb8d69835802125186..acf7fe4e5278cbebbade39fe8581331c8dd39b34 100644
--- a/indra/cmake/ZLIBNG.cmake
+++ b/indra/cmake/ZLIBNG.cmake
@@ -16,7 +16,9 @@ if (WINDOWS)
       debug ${ARCH_PREBUILT_DIRS_DEBUG}/zlibd.lib
       optimized ${ARCH_PREBUILT_DIRS_RELEASE}/zlib.lib)
 else()
-  target_link_libraries( ll::zlib-ng INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libz.a)
+  target_link_libraries( ll::zlib-ng INTERFACE 
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libz.a
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libz.a)
 endif (WINDOWS)
 
 target_include_directories( ll::zlib-ng SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/zlib)
@@ -35,7 +37,10 @@ if (WINDOWS)
       optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libminizip.lib
       ll::zlib-ng)
 else()
-  target_link_libraries( ll::minizip-ng INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libminizip.a ll::zlib-ng)
+  target_link_libraries( ll::minizip-ng INTERFACE 
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libminizip.a 
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libminizip.a 
+      ll::zlib-ng)
 endif (WINDOWS)
 
 target_include_directories( ll::minizip-ng SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/minizip)