diff options
| -rw-r--r-- | lldb/lit/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | lldb/lit/Suite/lit.cfg | 15 | ||||
| -rw-r--r-- | lldb/lit/Suite/lit.site.cfg.in | 1 | ||||
| -rw-r--r-- | llvm/cmake/modules/LLVMConfig.cmake.in | 1 |
4 files changed, 9 insertions, 9 deletions
diff --git a/lldb/lit/CMakeLists.txt b/lldb/lit/CMakeLists.txt index 608b211bc0c..bb4314427e8 100644 --- a/lldb/lit/CMakeLists.txt +++ b/lldb/lit/CMakeLists.txt @@ -69,6 +69,7 @@ endif() llvm_canonicalize_cmake_booleans( LLDB_DISABLE_PYTHON LLVM_ENABLE_ZLIB + LLVM_ENABLE_SHARED_LIBS LLDB_IS_64_BITS) configure_lit_site_cfg( diff --git a/lldb/lit/Suite/lit.cfg b/lldb/lit/Suite/lit.cfg index aec9690662f..9504f4ca1d8 100644 --- a/lldb/lit/Suite/lit.cfg +++ b/lldb/lit/Suite/lit.cfg @@ -39,21 +39,18 @@ def find_shlibpath_var(): elif platform.system() == 'Windows': yield 'PATH' -if not 'DYLD_INSERT_LIBRARIES' in config.environment: - # Shared library build of LLVM may require LD_LIBRARY_PATH or equivalent. - # This clashes with DYLD_INSERT_LIBRARIES which is needed on Darwin. +# Shared library build of LLVM may require LD_LIBRARY_PATH or equivalent. +if config.shared_libs: for shlibpath_var in find_shlibpath_var(): # In stand-alone build llvm_shlib_dir specifies LLDB's lib directory while # llvm_libs_dir specifies LLVM's lib directory. shlibpath = os.path.pathsep.join( - (config.llvm_shlib_dir, - config.llvm_libs_dir, - config.environment.get(shlibpath_var, ''))) + (config.llvm_shlib_dir, config.llvm_libs_dir, + config.environment.get(shlibpath_var, ''))) config.environment[shlibpath_var] = shlibpath - break else: - lit_config.warning("unable to inject shared library path on '{}'" - .format(platform.system())) + lit_config.warning("unable to inject shared library path on '{}'".format( + platform.system())) # Build dotest command. dotest_cmd = [config.dotest_path] diff --git a/lldb/lit/Suite/lit.site.cfg.in b/lldb/lit/Suite/lit.site.cfg.in index 9b950cf32a0..306967d61fd 100644 --- a/lldb/lit/Suite/lit.site.cfg.in +++ b/lldb/lit/Suite/lit.site.cfg.in @@ -13,6 +13,7 @@ config.lldb_src_root = "@LLDB_SOURCE_DIR@" config.cmake_cxx_compiler = "@CMAKE_CXX_COMPILER@" config.host_os = "@HOST_OS@" config.host_triple = "@LLVM_HOST_TRIPLE@" +config.shared_libs = @LLVM_ENABLE_SHARED_LIBS@ config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@" config.target_triple = "@TARGET_TRIPLE@" config.lldb_build_directory = "@LLDB_TEST_BUILD_DIRECTORY@" diff --git a/llvm/cmake/modules/LLVMConfig.cmake.in b/llvm/cmake/modules/LLVMConfig.cmake.in index 536031f790d..6dcbaac4469 100644 --- a/llvm/cmake/modules/LLVMConfig.cmake.in +++ b/llvm/cmake/modules/LLVMConfig.cmake.in @@ -84,6 +84,7 @@ set(LLVM_TOOLS_BINARY_DIR "@LLVM_CONFIG_TOOLS_BINARY_DIR@") set(LLVM_TOOLS_INSTALL_DIR "@LLVM_TOOLS_INSTALL_DIR@") set(LLVM_HAVE_OPT_VIEWER_MODULES @LLVM_HAVE_OPT_VIEWER_MODULES@) set(LLVM_CONFIGURATION_TYPES @CMAKE_CONFIGURATION_TYPES@) +set(LLVM_ENABLE_SHARED_LIBS @BUILD_SHARED_LIBS@) if(NOT TARGET LLVMSupport) set(LLVM_EXPORTED_TARGETS "@LLVM_CONFIG_EXPORTS@") |
