[PATCH] D39022: Don't set static-libs test feature when using LLVM_LINK_LLVM_DYLIB

[Phabricator via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL316123: Don't set static-libs test feature when using LLVM_LINK_LLVM_DYLIB (authored by sbc).

Repository:
  rL LLVM

https://reviews.llvm.org/D39022

Files:
  llvm/trunk/test/CMakeLists.txt
  llvm/trunk/test/lit.cfg.py
  llvm/trunk/test/lit.site.cfg.py.in


Index: llvm/trunk/test/lit.site.cfg.py.in
===================================================================
--- llvm/trunk/test/lit.site.cfg.py.in
+++ llvm/trunk/test/lit.site.cfg.py.in
@@ -40,7 +40,8 @@
 config.have_dia_sdk = @LLVM_ENABLE_DIA_SDK@
 config.enable_ffi = @LLVM_ENABLE_FFI@
 config.build_shared_libs = @BUILD_SHARED_LIBS@
-config.llvm_libxml2_enabled = "@LLVM_LIBXML2_ENABLED@"
+config.link_llvm_dylib = @LLVM_LINK_LLVM_DYLIB@
+config.llvm_libxml2_enabled = @LLVM_LIBXML2_ENABLED@
 
 # Support substitution of the tools_dir with user parameters. This is
 # used when we can't determine the tool dir at configuration time.
Index: llvm/trunk/test/lit.cfg.py
===================================================================
--- llvm/trunk/test/lit.cfg.py
+++ llvm/trunk/test/lit.cfg.py
@@ -185,7 +185,7 @@
     config.available_features.add('loadable_module')
 
 # Static libraries are not built if BUILD_SHARED_LIBS is ON.
-if not config.build_shared_libs:
+if not config.build_shared_libs and not config.link_llvm_dylib:
     config.available_features.add('static-libs')
 
 # Direct object generation
Index: llvm/trunk/test/CMakeLists.txt
===================================================================
--- llvm/trunk/test/CMakeLists.txt
+++ llvm/trunk/test/CMakeLists.txt
@@ -8,7 +8,9 @@
   HAVE_LIBXAR
   LLVM_ENABLE_DIA_SDK
   LLVM_ENABLE_FFI
-  BUILD_SHARED_LIBS)
+  BUILD_SHARED_LIBS
+  LLVM_LINK_LLVM_DYLIB
+  )
 
 configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D39022.119516.patch
Type: text/x-patch
Size: 1517 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20171018/e73e230f/attachment.bin>