Index: tools/bugpoint/CMakeLists.txt
===================================================================
--- tools/bugpoint/CMakeLists.txt
+++ tools/bugpoint/CMakeLists.txt
@@ -35,8 +35,26 @@
   )
 export_executable_symbols(bugpoint)
 
-if(WITH_POLLY AND LINK_POLLY_INTO_TOOLS)
-  target_link_libraries(bugpoint Polly)
-  # Ensure LLVMTarget can resolve dependences in Polly.
-  target_link_libraries(bugpoint LLVMTarget)
-endif(WITH_POLLY AND LINK_POLLY_INTO_TOOLS)
+function(chk_GPU_lib_for_Polly lib_name)
+  if (NOT TARGET ${lib_name})
+    message(FATAL_ERROR 
+      "${lib_name} not being built, is required by Polly-ACC.")
+  endif (NOT TARGET ${lib_name})
+endfunction(chk_GPU_lib_for_Polly)
+
+if (WITH_POLLY)
+  if (LINK_POLLY_INTO_TOOLS)
+    target_link_libraries(bugpoint Polly)
+    # Ensure LLVMTarget can resolve dependences in Polly.
+    target_link_libraries(bugpoint LLVMTarget)
+  endif (LINK_POLLY_INTO_TOOLS)
+  if (POLLY_ENABLE_GPGPU_CODEGEN)
+    chk_GPU_lib_for_Polly(LLVMNVPTXCodeGen)
+    chk_GPU_lib_for_Polly(LLVMNVPTXInfo)
+    chk_GPU_lib_for_Polly(LLVMNVPTXDesc)
+    chk_GPU_lib_for_Polly(LLVMNVPTXAsmPrinter)
+    LIST(APPEND LLVM_LINK_COMPONENTS
+      ${LLVM_TARGETS_TO_BUILD}
+      )
+  endif (POLLY_ENABLE_GPGPU_CODEGEN)
+endif (WITH_POLLY)