Index: test/lit.cfg
===================================================================
--- test/lit.cfg
+++ test/lit.cfg
@@ -195,12 +195,8 @@
     lit_config.note('using clang: %r' % config.clang)
 
 # Plugins (loadable modules)
-# TODO: This should be supplied by Makefile or autoconf.
-if sys.platform in ['win32', 'cygwin']:
-    has_plugins = (config.enable_shared == 1)
-else:
-    has_plugins = True
-
+has_plugins = (config.llvm_enable_plugins == "ON" or
+               config.llvm_export_symbols_for_plugins == "ON")
 if has_plugins and config.llvm_plugin_ext:
     config.available_features.add('plugins')
 
Index: test/lit.site.cfg.in
===================================================================
--- test/lit.site.cfg.in
+++ test/lit.site.cfg.in
@@ -7,6 +7,8 @@
 config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
 config.llvm_libs_dir = "@LLVM_LIBS_DIR@"
 config.llvm_shlib_dir = "@SHLIBDIR@"
+config.llvm_enable_plugins = "@LLVM_ENABLE_PLUGINS@"
+config.llvm_export_symbols_for_plugins = "@LLVM_EXPORT_SYMBOLS_FOR_PLUGINS@"
 config.llvm_plugin_ext = "@LLVM_PLUGIN_EXT@"
 config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
 config.clang_obj_root = "@CLANG_BINARY_DIR@"