diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index 1677d6f25f..45164f91ca 100644
--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -203,6 +203,6 @@ if (SDL_FOUND)
     )
 endif (SDL_FOUND)
 
-# ND: What kind of sorcery is this supposed to be, link llwindow against itself? cmake does not like this a bit.
-#  target_link_libraries (llwindow ${llwindow_LINK_LIBRARIES})
-
+if (NOT USESYSTEMLIBS)
+target_link_libraries (llwindow ${llwindow_LINK_LIBRARIES})
+endif()