---
 cmake/modules/AddLLVM.cmake |    2 -
 polly/lib/CMakeLists.txt    |   47 +++++++++++++++++---------------------------
 2 files changed, 20 insertions(+), 29 deletions(-)

--- a/cmake/modules/AddLLVM.cmake
+++ b/cmake/modules/AddLLVM.cmake
@@ -501,7 +501,7 @@ function(llvm_add_library name)
     # On DLL platforms symbols are imported from the tool by linking against it.
     set(llvm_libs ${ARG_PLUGIN_TOOL})
   elseif (DEFINED LLVM_LINK_COMPONENTS OR DEFINED ARG_LINK_COMPONENTS)
-    if (LLVM_LINK_LLVM_DYLIB AND NOT ARG_DISABLE_LLVM_LINK_LLVM_DYLIB)
+    if (NOT ARG_STATIC AND LLVM_LINK_LLVM_DYLIB AND NOT ARG_DISABLE_LLVM_LINK_LLVM_DYLIB)
       set(llvm_libs LLVM)
     else()
       llvm_map_components_to_libnames(llvm_libs
--- a/polly/lib/CMakeLists.txt
+++ b/polly/lib/CMakeLists.txt
@@ -66,35 +66,26 @@ endif (GPU_CODEGEN)
 
 target_link_libraries(Polly PollyISL jsoncpp)
 
-if (BUILD_SHARED_LIBS)
-  target_link_libraries(Polly
-    LLVMSupport
-    LLVMCore
-    LLVMScalarOpts
-    LLVMInstCombine
-    LLVMTransformUtils
-    LLVMAnalysis
-    LLVMipo
-    LLVMMC
+target_link_libraries(Polly
+  LLVMSupport
+  LLVMCore
+  LLVMScalarOpts
+  LLVMInstCombine
+  LLVMTransformUtils
+  LLVMAnalysis
+  LLVMipo
+  LLVMMC
 # The libraries below are required for darwin: http://PR26392
-    LLVMBitReader
-    LLVMMCParser
-    LLVMObject
-    LLVMProfileData
-    LLVMTarget
-    LLVMVectorize
-  )
-  link_directories(
-    ${LLVM_LIBRARY_DIR}
-  )
-elseif (LLVM_LINK_LLVM_DYLIB)
-  target_link_libraries(Polly
-    LLVM
-  )
-  link_directories(
-    ${LLVM_LIBRARY_DIR}
-  )
-endif()
+  LLVMBitReader
+  LLVMMCParser
+  LLVMObject
+  LLVMProfileData
+  LLVMTarget
+  LLVMVectorize
+)
+link_directories(
+  ${LLVM_LIBRARY_DIR}
+)
 
 # Build a monolithic Polly.a and a thin module LLVMPolly.moduleext that links to
 # that static library.