Ensure that ENABLE_SHARED is substituted for use in Windows builds

We (perhaps over-cautiously) disable the new plugin tests on static Windows
builds right now, matching what LLVM core does. This change was needed for the
lit check to work.

Thanks to Warren Hunt for spotting this.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@198782 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Makefile b/test/Makefile
index 684a67b47dcb2a90b06226641ffb57a56a370202..da7b96541807b28c3fd44fff53b6154515ef87bd 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -50,6 +50,7 @@ lit.site.cfg: FORCE
        @$(ECHOPATH) s=@ENABLE_CLANG_REWRITER@=$(ENABLE_CLANG_REWRITER)=g >> lit.tmp
        @$(ECHOPATH) s=@ENABLE_CLANG_STATIC_ANALYZER@=$(ENABLE_CLANG_STATIC_ANALYZER)=g >> lit.tmp
        @$(ECHOPATH) s=@ENABLE_CLANG_EXAMPLES@=$(ENABLE_CLANG_EXAMPLES)=g >> lit.tmp
+       @$(ECHOPATH) s=@ENABLE_SHARED@=$(ENABLE_SHARED)=g >> lit.tmp
        @sed -f lit.tmp $(PROJ_SRC_DIR)/lit.site.cfg.in > $@
        @-rm -f lit.tmp
 

diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
index 480143ceff5e6e2f09ad48d34234360846b55119..291788f38b2b3e29ab30aabafb7e13fdd80596c7 100644 (file)
--- a/test/lit.site.cfg.in
+++ b/test/lit.site.cfg.in
@@ -17,6 +17,7 @@ config.clang_arcmt = @ENABLE_CLANG_ARCMT@
 config.clang_staticanalyzer = @ENABLE_CLANG_STATIC_ANALYZER@
 config.clang_rewriter = @ENABLE_CLANG_REWRITER@
 config.clang_examples = @ENABLE_CLANG_EXAMPLES@
+config.enable_shared = @ENABLE_SHARED@
 config.host_arch = "@HOST_ARCH@"
 
 # Support substitution of the tools and libs dirs with user parameters. This is