[llvm-branch-commits] [polly] r324872 - Merging r323041:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Mon Feb 12 01:56:09 2018
New Revision: 324872

URL: http://llvm.org/viewvc/llvm-project?rev=324872&view=rev
Log:
Merging r323041:
------------------------------------------------------------------------
r323041 | dim | 2018-01-20 15:35:05 +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:
    polly/branches/release_60/   (props changed)
    polly/branches/release_60/test/Unit/lit.cfg

Propchange: polly/branches/release_60/
------------------------------------------------------------------------------
    svn:mergeinfo = /polly/trunk:323041

Modified: polly/branches/release_60/test/Unit/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/polly/branches/release_60/test/Unit/lit.cfg?rev=324872&r1=324871&r2=324872&view=diff
==============================================================================
--- polly/branches/release_60/test/Unit/lit.cfg (original)
+++ polly/branches/release_60/test/Unit/lit.cfg Mon Feb 12 01:56:09 2018
@@ -37,13 +37,12 @@ for symbolizer in ['ASAN_SYMBOLIZER_PATH
     if symbolizer in os.environ:
         config.environment[symbolizer] = os.environ[symbolizer]
 
-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.llvm_libs_dir,