diff --git a/flang/lib/Evaluate/CMakeLists.txt b/flang/lib/Evaluate/CMakeLists.txt
--- a/flang/lib/Evaluate/CMakeLists.txt
+++ b/flang/lib/Evaluate/CMakeLists.txt
@@ -29,6 +29,7 @@
   LINK_LIBS
   FortranCommon
   FortranDecimal
+  FortranSemantics
   FortranParser
 )
 
diff --git a/flang/lib/Optimizer/Dialect/CMakeLists.txt b/flang/lib/Optimizer/Dialect/CMakeLists.txt
--- a/flang/lib/Optimizer/Dialect/CMakeLists.txt
+++ b/flang/lib/Optimizer/Dialect/CMakeLists.txt
@@ -1,3 +1,5 @@
+get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
+
 add_flang_library(FIRDialect
   FIRAttr.cpp
   FIRDialect.cpp
@@ -6,6 +8,7 @@
 
   DEPENDS
   FIROpsIncGen
+  ${dialect_libs}
 
   LINK_LIBS
   FIRSupport
diff --git a/flang/lib/Optimizer/Support/CMakeLists.txt b/flang/lib/Optimizer/Support/CMakeLists.txt
--- a/flang/lib/Optimizer/Support/CMakeLists.txt
+++ b/flang/lib/Optimizer/Support/CMakeLists.txt
@@ -3,6 +3,8 @@
 add_flang_library(FIRSupport
   KindMapping.cpp
 
+  DEPENDS
+  ${dialect_libs}
   LINK_LIBS
   ${dialect_libs}
 )