diff --git a/mlir/cmake/modules/AddMLIR.cmake b/mlir/cmake/modules/AddMLIR.cmake
--- a/mlir/cmake/modules/AddMLIR.cmake
+++ b/mlir/cmake/modules/AddMLIR.cmake
@@ -179,7 +179,7 @@
           # same symbol might be loaded from 2 separate libraries.  This
           # often comes from referring to an LLVM library target
           # explicitly in target_link_libraries()
-          message("WARNING: ${l} links LLVM and ${lib}!")
+          message("WARNING: ${name} links LLVM and ${lib}!")
         endif()
       endif()
     endforeach()
diff --git a/mlir/tools/mlir-opt/CMakeLists.txt b/mlir/tools/mlir-opt/CMakeLists.txt
--- a/mlir/tools/mlir-opt/CMakeLists.txt
+++ b/mlir/tools/mlir-opt/CMakeLists.txt
@@ -52,4 +52,4 @@
 target_link_libraries(mlir-opt PRIVATE ${LIBS})
 llvm_update_compile_flags(mlir-opt)
 
-mlir_check_link_libraries(mlir-opt)
+mlir_check_all_link_libraries(mlir-opt)