diff --git a/test/Macros/lit.local.cfg b/test/Macros/lit.local.cfg
index 8c81d28d267..fe1101a5025 100644
--- a/test/Macros/lit.local.cfg
+++ b/test/Macros/lit.local.cfg
@@ -21,11 +21,12 @@ if get_target_os() in ['windows-msvc']:
 else:
     # FIXME(compnerd) do all the targets we currently support use SysV ABI?
     config.substitutions.insert(0, ('%target-abi', 'SYSV'))
+    config.substitutions.insert(0, ('%cmake-c-compiler', config.cmake_c_compiler))
     config.substitutions.insert(
         0,
         (
             '%swift-build-c-plugin',
-            '%clang %c-flags %exe-linker-flags -isysroot %host_sdk -I %swift_src_root/include -L %swift-lib-dir -l_swiftMockPlugin -Xlinker -rpath -Xlinker %swift-lib-dir'
+            '%cmake-c-compiler %c-flags %exe-linker-flags -target %host_triple -isysroot %host_sdk -I %swift_src_root/include -L %swift-lib-dir -l_swiftMockPlugin -Xlinker -rpath -Xlinker %swift-lib-dir'
         )
     )
     config.substitutions.append(('%c-flags', config.c_flags))
diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
index a379f1d6c7c..b94a7bd645f 100644
--- a/test/lit.site.cfg.in
+++ b/test/lit.site.cfg.in
@@ -44,6 +44,8 @@ config.swift_driver_test_options = "@SWIFT_DRIVER_TEST_OPTIONS@"
 config.swift_frontend_test_options = "@SWIFT_FRONTEND_TEST_OPTIONS@"
 config.swift_ide_test_test_options = "@SWIFT_IDE_TEST_TEST_OPTIONS@"
 
+config.cmake_c_compiler = r'''@CMAKE_C_COMPILER@'''
+config.cmake_cxx_compiler = r'''@CMAKE_CXX_COMPILER@'''
 config.c_flags = r'''@CMAKE_C_FLAGS@'''
 config.exe_linker_flags = r'''@CMAKE_EXE_LINKER_FLAGS@'''
 
diff --git a/tools/libMockPlugin/CMakeLists.txt b/tools/libMockPlugin/CMakeLists.txt
index ff85bc17c93..4f2d209fd48 100644
--- a/tools/libMockPlugin/CMakeLists.txt
+++ b/tools/libMockPlugin/CMakeLists.txt
@@ -16,4 +16,4 @@ add_llvm_symbol_exports(libMockPlugin ${LLVM_EXPORTED_SYMBOL_FILE})
 
 add_dependencies(tools libMockPlugin)
 # Adds -dead_strip option
-add_link_opts(libStaticMirror)
+add_link_opts(libMockPlugin)