[PATCH] D30155: [clang-tools-extra] [test] Fix clang library dir in LD_LIBRARY_PATH For stand-alone build

[Michał Górny via Phabricator via cfe-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL309979: [test] Fix clang library dir in LD_LIBRARY_PATH For stand-alone build (authored by mgorny).

Changed prior to commit:
  https://reviews.llvm.org/D30155?vs=89062&id=109616#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D30155

Files:
  clang-tools-extra/trunk/test/Unit/lit.cfg
  clang-tools-extra/trunk/test/lit.cfg
  clang-tools-extra/trunk/test/lit.site.cfg.in


Index: clang-tools-extra/trunk/test/lit.site.cfg.in
===================================================================
--- clang-tools-extra/trunk/test/lit.site.cfg.in
+++ clang-tools-extra/trunk/test/lit.site.cfg.in
@@ -7,6 +7,7 @@
 config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
 config.clang_tools_binary_dir = "@CLANG_TOOLS_BINARY_DIR@"
 config.clang_tools_dir = "@CLANG_TOOLS_DIR@"
+config.clang_libs_dir = "@SHLIBDIR@"
 config.python_executable = "@PYTHON_EXECUTABLE@"
 config.target_triple = "@TARGET_TRIPLE@"
 
Index: clang-tools-extra/trunk/test/lit.cfg
===================================================================
--- clang-tools-extra/trunk/test/lit.cfg
+++ clang-tools-extra/trunk/test/lit.cfg
@@ -99,10 +99,13 @@
             clang_tools_dir, llvm_tools_dir, config.environment['PATH']))
     config.environment['PATH'] = path
 
+    clang_libs_dir = getattr(config, 'clang_libs_dir', None)
+    if not clang_libs_dir:
+        lit_config.fatal('No Clang libs dir set!')
     llvm_libs_dir = getattr(config, 'llvm_libs_dir', None)
     if not llvm_libs_dir:
         lit_config.fatal('No LLVM libs dir set!')
-    path = os.path.pathsep.join((llvm_libs_dir,
+    path = os.path.pathsep.join((clang_libs_dir, llvm_libs_dir,
                                  config.environment.get('LD_LIBRARY_PATH','')))
     config.environment['LD_LIBRARY_PATH'] = path
 
Index: clang-tools-extra/trunk/test/Unit/lit.cfg
===================================================================
--- clang-tools-extra/trunk/test/Unit/lit.cfg
+++ clang-tools-extra/trunk/test/Unit/lit.cfg
@@ -41,14 +41,17 @@
     shlibpath_var = 'PATH'
 
 # Point the dynamic loader at dynamic libraries in 'lib'.
+shlibdir = getattr(config, 'shlibdir', None)
+if not shlibdir:
+    lit_config.fatal('No shlibdir set!')
 llvm_libs_dir = getattr(config, 'llvm_libs_dir', None)
 if not llvm_libs_dir:
     lit_config.fatal('No LLVM libs dir set!')
-shlibpath = os.path.pathsep.join((llvm_libs_dir,
+shlibpath = os.path.pathsep.join((shlibdir, llvm_libs_dir,
                                  config.environment.get(shlibpath_var,'')))
 
 # Win32 seeks DLLs along %PATH%.
-if sys.platform in ['win32', 'cygwin'] and os.path.isdir(config.shlibdir):
-    shlibpath = os.path.pathsep.join((config.shlibdir, shlibpath))
+if sys.platform in ['win32', 'cygwin'] and os.path.isdir(shlibdir):
+    shlibpath = os.path.pathsep.join((shlibdir, shlibpath))
 
 config.environment[shlibpath_var] = shlibpath


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D30155.109616.patch
Type: text/x-patch
Size: 2472 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20170803/583d93b3/attachment.bin>