diff --git a/flang/lib/common/CMakeLists.txt b/flang/lib/common/CMakeLists.txt
index 30a32b9912ba..b76033fea384 100644
--- a/flang/lib/common/CMakeLists.txt
+++ b/flang/lib/common/CMakeLists.txt
@@ -12,8 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-add_library(FortranCommon SHARED
+add_library(FortranCommon
   default-kinds.cc
   idioms.cc
 )
-
diff --git a/flang/lib/evaluate/CMakeLists.txt b/flang/lib/evaluate/CMakeLists.txt
index ac1c914a967f..ce5327436feb 100644
--- a/flang/lib/evaluate/CMakeLists.txt
+++ b/flang/lib/evaluate/CMakeLists.txt
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-add_library(FortranEvaluate SHARED
+add_library(FortranEvaluate
   call.cc
   common.cc
   complex.cc
diff --git a/flang/lib/parser/CMakeLists.txt b/flang/lib/parser/CMakeLists.txt
index 1fb5cd1ad7c1..090ffbf7c6e9 100644
--- a/flang/lib/parser/CMakeLists.txt
+++ b/flang/lib/parser/CMakeLists.txt
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-add_library(FortranParser SHARED
+add_library(FortranParser
   char-buffer.cc
   char-set.cc
   characters.cc
diff --git a/flang/lib/semantics/CMakeLists.txt b/flang/lib/semantics/CMakeLists.txt
index 42304a93ce5e..0f55e85b6fa1 100644
--- a/flang/lib/semantics/CMakeLists.txt
+++ b/flang/lib/semantics/CMakeLists.txt
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-add_library(FortranSemantics SHARED
+add_library(FortranSemantics
   assignment.cc
   attr.cc
   canonicalize-do.cc
diff --git a/flang/runtime/CMakeLists.txt b/flang/runtime/CMakeLists.txt
index 72b6945ccb54..72fd63478b1a 100644
--- a/flang/runtime/CMakeLists.txt
+++ b/flang/runtime/CMakeLists.txt
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-add_library(FortranRuntime SHARED
+add_library(FortranRuntime
   ISO_Fortran_binding.cc
   derived-type.cc
   descriptor.cc