Author: jdevlieghere Date: Fri Aug 30 16:16:02 2019 New Revision: 370549 URL: http://llvm.org/viewvc/llvm-project?rev=370549&view=rev Log: [lit] Only set DYLD_LIBRARY_PATH for shared builds
In r370135 I committed a temporary workaround for the sanitized bot to not set (DY)LD_LIBRARY_PATH when (DY)LD_INSERT_LIBRARIES was set. Setting (DY)LD_LIBRARY_PATH is only necessary for (standalone) shared-library builds, so a better solution is to only set the environment variable when necessary. Differential revision: https://reviews.llvm.org/D67012 Modified: lldb/trunk/lit/CMakeLists.txt lldb/trunk/lit/Suite/lit.cfg lldb/trunk/lit/Suite/lit.site.cfg.in Modified: lldb/trunk/lit/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/CMakeLists.txt?rev=370549&r1=370548&r2=370549&view=diff ============================================================================== --- lldb/trunk/lit/CMakeLists.txt (original) +++ lldb/trunk/lit/CMakeLists.txt Fri Aug 30 16:16:02 2019 @@ -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( Modified: lldb/trunk/lit/Suite/lit.cfg URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/Suite/lit.cfg?rev=370549&r1=370548&r2=370549&view=diff ============================================================================== --- lldb/trunk/lit/Suite/lit.cfg (original) +++ lldb/trunk/lit/Suite/lit.cfg Fri Aug 30 16:16:02 2019 @@ -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] Modified: lldb/trunk/lit/Suite/lit.site.cfg.in URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/Suite/lit.site.cfg.in?rev=370549&r1=370548&r2=370549&view=diff ============================================================================== --- lldb/trunk/lit/Suite/lit.site.cfg.in (original) +++ lldb/trunk/lit/Suite/lit.site.cfg.in Fri Aug 30 16:16:02 2019 @@ -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@" _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
