diff --git a/llvm/tools/CMakeLists.txt b/llvm/tools/CMakeLists.txt
index 72364618b36d..4d9e32db8e89 100644
--- a/llvm/tools/CMakeLists.txt
+++ b/llvm/tools/CMakeLists.txt
@@ -46,10 +46,10 @@ add_subdirectory(llvm-stub)
 add_subdirectory(edis)
 add_subdirectory(llvmc)
 
+add_subdirectory(lto)
 if( LLVM_ENABLE_PIC )
   # TODO: support other systems:
   if( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
-    add_subdirectory(lto)
     add_subdirectory(gold)
   endif()
 endif()
diff --git a/llvm/tools/lto/CMakeLists.txt b/llvm/tools/lto/CMakeLists.txt
index b0aebd4f2ee1..ece4af3263ed 100644
--- a/llvm/tools/lto/CMakeLists.txt
+++ b/llvm/tools/lto/CMakeLists.txt
@@ -4,12 +4,16 @@ set(LLVM_LINK_COMPONENTS
 
 add_definitions( -DLLVM_VERSION_INFO=\"${PACKAGE_VERSION}\" )
 
-# TODO: build a static library too.
-set(BUILD_SHARED_LIBS ON)
-
-add_llvm_library(LTO
+set(SOURCES
   LTOCodeGenerator.cpp
   lto.cpp
   LTOModule.cpp
   )
 
+add_llvm_library(LTO ${SOURCES})
+
+if( NOT WIN32 AND LLVM_ENABLE_PIC )
+  set(BUILD_SHARED_LIBS ON)
+  add_llvm_library(LTO_dll ${SOURCES})
+  set_property(TARGET LTO_dll PROPERTY OUTPUT_NAME "LTO")
+endif()