diff -ur llvm-project-apple-stable-20191106/llvm/projects/libtapi/lib/Core/CMakeLists.txt llvm-project-apple-stable-20191106+arm64e/llvm/projects/libtapi/lib/Core/CMakeLists.txt
--- llvm-project-apple-stable-20191106/llvm/projects/libtapi/lib/Core/CMakeLists.txt	2019-12-16 13:43:35.000000000 -1000
+++ llvm-project-apple-stable-20191106+arm64e/llvm/projects/libtapi/lib/Core/CMakeLists.txt	2019-12-16 13:21:43.000000000 -1000
@@ -3,6 +3,45 @@
   BinaryFormat
   )
 
+if(CLANG_LINK_CLANG_DYLIB)
+add_tapi_library(tapiCore
+  Architecture.cpp
+  ArchitectureSet.cpp
+  ArchitectureSupport.cpp
+  API.cpp
+  APIPrinter.cpp
+  APIVisitor.cpp
+  AvailabilityInfo.cpp
+  FakeSymbols.cpp
+  FileManager.cpp
+  FileSystem.cpp
+  Framework.cpp
+  ExtendedInterfaceFile.cpp
+  HeaderFile.cpp
+  InterfaceFile.cpp
+  InterfaceFileBase.cpp
+  InterfaceFileManager.cpp
+  JSONFile.cpp
+  MachODylibReader.cpp
+  Path.cpp
+  Platform.cpp
+  ReexportFileWriter.cpp
+  Registry.cpp
+  Symbol.cpp
+  TapiError.cpp
+  TextStub_v1.cpp
+  TextStub_v2.cpp
+  TextStub_v3.cpp
+  Utils.cpp
+  XPI.cpp
+  XPISet.cpp
+  YAML.cpp
+  YAMLReaderWriter.cpp
+
+  LINK_LIBS
+  clang-cpp
+  )
+else()
 add_tapi_library(tapiCore
   Architecture.cpp
   ArchitectureSet.cpp
@@ -40,6 +79,8 @@
   LINK_LIBS
   clangBasic
   )
+endif()
+
 add_dependencies(tapiCore clang-resource-headers)
 if(Clang_DIR)
     set(clang_lib_dir ${Clang_DIR}/../..)
diff -ur llvm-project-apple-stable-20191106/llvm/projects/libtapi/lib/Frontend/CMakeLists.txt llvm-project-apple-stable-20191106+arm64e/llvm/projects/libtapi/lib/Frontend/CMakeLists.txt
--- llvm-project-apple-stable-20191106/llvm/projects/libtapi/lib/Frontend/CMakeLists.txt	2019-03-22 10:58:37.000000000 -1000
+++ llvm-project-apple-stable-20191106+arm64e/llvm/projects/libtapi/lib/Frontend/CMakeLists.txt	2019-12-16 13:20:44.000000000 -1000
@@ -3,6 +3,7 @@
   Core
   )
 
+if(CLANG_LINK_CLANG_DYLIB)
 add_tapi_library(tapiFrontend
   APIVisitor.cpp
   Frontend.cpp
@@ -12,6 +13,20 @@
   ClangDriverOptions
 
   LINK_LIBS
-  clangFrontend
   tapiDiagnostics
+  clang-cpp
+  )
+else()
+add_tapi_library(tapiFrontend
+  APIVisitor.cpp
+  Frontend.cpp
+  FrontendContext.cpp
+
+  DEPENDS
+  ClangDriverOptions
+
+  LINK_LIBS
+  tapiDiagnostics
+  clangFrontend
   )
+endif()