diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
index fdc7755de87f..5577e318c2f3 100644
--- a/clang/CMakeLists.txt
+++ b/clang/CMakeLists.txt
@@ -88,13 +88,15 @@ macro(add_clang_library name)
   if( LLVM_LINK_COMPONENTS )
     llvm_config(${name} ${LLVM_LINK_COMPONENTS})
   endif( LLVM_LINK_COMPONENTS )
-  get_system_libs(llvm_system_libs)
-  if( llvm_system_libs )
-    target_link_libraries(${name} ${llvm_system_libs})
-  endif( llvm_system_libs )
   if (LLVM_COMMON_LIBS)
     target_link_libraries(${name} ${LLVM_COMMON_LIBS})
   endif()
+  if( NOT MINGW )
+    get_system_libs(llvm_system_libs)
+    if( llvm_system_libs )
+      target_link_libraries(${name} ${llvm_system_libs})
+    endif()
+  endif()
   add_dependencies(${name} ClangDiagnosticCommon)
   if(MSVC)
     get_target_property(cflag ${name} COMPILE_FLAGS)
diff --git a/clang/lib/CodeGen/CMakeLists.txt b/clang/lib/CodeGen/CMakeLists.txt
index 7414e36ab3f5..3729c6a57718 100644
--- a/clang/lib/CodeGen/CMakeLists.txt
+++ b/clang/lib/CodeGen/CMakeLists.txt
@@ -46,8 +46,10 @@ target_link_libraries(clangCodeGen
   )
 
 add_dependencies(clangCodeGen
+  ClangARMNeon
   ClangAttrClasses
   ClangAttrList
   ClangDeclNodes
   ClangStmtNodes
+  ClangDiagnosticFrontend
   )