Author: hans
Date: Mon Feb 12 01:54:35 2018
New Revision: 324871
URL: http://llvm.org/viewvc/llvm-project?rev=324871&view=rev
Log:
Merging r323040:
------------------------------------------------------------------------
r323040 | dim | 2018-01-20 15:34:33 +0100 (Sat, 20 Jan 2018) | 5 lines
Assume the shared library path variable is LD_LIBRARY_PATH on systems
except Darwin and Windows. This prevents inserting an environment
variable with an empty name (which is illegal and leads to a Python
exception) on any of the BSDs.
------------------------------------------------------------------------
Modified:
clang-tools-extra/branches/release_60/ (props changed)
clang-tools-extra/branches/release_60/test/Unit/lit.cfg
Propchange: clang-tools-extra/branches/release_60/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 12 01:54:35 2018
@@ -1 +1 @@
-/clang-tools-extra/trunk:321762
+/clang-tools-extra/trunk:321762,323040
Modified: clang-tools-extra/branches/release_60/test/Unit/lit.cfg
URL:
http://llvm.org/viewvc/llvm-project/clang-tools-extra/branches/release_60/test/Unit/lit.cfg?rev=324871&r1=324870&r2=324871&view=diff
==============================================================================
--- clang-tools-extra/branches/release_60/test/Unit/lit.cfg (original)
+++ clang-tools-extra/branches/release_60/test/Unit/lit.cfg Mon Feb 12 01:54:35
2018
@@ -19,13 +19,12 @@ config.test_exec_root = config.test_sour
# ;-separated list of subdirectories).
config.test_format = lit.formats.GoogleTest('.', 'Tests')
-shlibpath_var = ''
-if platform.system() == 'Linux':
- shlibpath_var = 'LD_LIBRARY_PATH'
-elif platform.system() == 'Darwin':
+if platform.system() == 'Darwin':
shlibpath_var = 'DYLD_LIBRARY_PATH'
elif platform.system() == 'Windows':
shlibpath_var = 'PATH'
+else:
+ shlibpath_var = 'LD_LIBRARY_PATH'
# Point the dynamic loader at dynamic libraries in 'lib'.
shlibpath = os.path.pathsep.join((config.shlibdir, config.llvm_libs_dir,
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
