diff options
Diffstat (limited to 'llvm/test')
| -rw-r--r-- | llvm/test/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | llvm/test/lit.cfg.py | 2 | ||||
| -rw-r--r-- | llvm/test/lit.site.cfg.py.in | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/llvm/test/CMakeLists.txt b/llvm/test/CMakeLists.txt index 33e5da0eb1b..efb43955d57 100644 --- a/llvm/test/CMakeLists.txt +++ b/llvm/test/CMakeLists.txt @@ -8,7 +8,9 @@ llvm_canonicalize_cmake_booleans( 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 diff --git a/llvm/test/lit.cfg.py b/llvm/test/lit.cfg.py index 7b935c19558..6a5cf69b987 100644 --- a/llvm/test/lit.cfg.py +++ b/llvm/test/lit.cfg.py @@ -185,7 +185,7 @@ if loadable_module: 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 diff --git a/llvm/test/lit.site.cfg.py.in b/llvm/test/lit.site.cfg.py.in index 45f265afb97..a1fd0538597 100644 --- a/llvm/test/lit.site.cfg.py.in +++ b/llvm/test/lit.site.cfg.py.in @@ -40,7 +40,8 @@ config.have_libxar = @HAVE_LIBXAR@ 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. |
