diff --git a/libc/cmake/modules/prepare_libc_gpu_build.cmake b/libc/cmake/modules/prepare_libc_gpu_build.cmake
index 9e0ce79ce5652..21851285c6245 100644
--- a/libc/cmake/modules/prepare_libc_gpu_build.cmake
+++ b/libc/cmake/modules/prepare_libc_gpu_build.cmake
@@ -103,6 +103,5 @@ if(LIBC_GPU_TARGET_ARCHITECTURE_IS_NVPTX)
   find_package(CUDAToolkit QUIET)
   if(CUDAToolkit_FOUND)
     get_filename_component(LIBC_CUDA_ROOT "${CUDAToolkit_BIN_DIR}" DIRECTORY ABSOLUTE)
-    message(WARNING ${LIBC_CUDA_ROOT})
   endif()
 endif()
diff --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt
index d47a2d5ee7e37..8cf4365363098 100644
--- a/llvm/runtimes/CMakeLists.txt
+++ b/llvm/runtimes/CMakeLists.txt
@@ -382,7 +382,11 @@ if(runtimes)
       message(FATAL_ERROR "libc-hdrgen target missing unexpectedly")
     endif()
     if(LIBC_GPU_BUILD OR LIBC_GPU_ARCHITECTURES)
-      list(APPEND extra_deps clang-offload-packager nvptx-arch amdgpu-arch)
+      foreach(dep clang-offload-packager nvptx-arch amdgpu-arch)
+        if(TARGET ${dep})
+          list(APPEND extra_deps ${dep})
+        endif()
+      endforeach()
     endif()
   endif()
   if(NOT LLVM_RUNTIME_TARGETS)