Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions openmp/runtime/test/lit.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if 'PYLINT_IMPORT' in os.environ:
config = object()
lit_config = object()

def append_dynamic_library_path(path):
def prepend_dynamic_library_path(path):
if config.operating_system == 'Windows':
name = 'PATH'
sep = ';'
Expand Down Expand Up @@ -65,10 +65,13 @@ for feature in config.test_compiler_features:
config.available_features.add(feature)

# Setup environment to find dynamic library at runtime
append_dynamic_library_path(config.library_dir)
if config.using_hwloc:
append_dynamic_library_path(config.hwloc_library_dir)
prepend_dynamic_library_path(config.hwloc_library_dir)
config.available_features.add('hwloc')
# Note: please keep config.library_dir *after* any potentially system
# directories, as otherwise preinstalled openmp libraries will be used
# over just-built
prepend_dynamic_library_path(config.library_dir)

# Rpath modifications for Darwin
if config.operating_system == 'Darwin':
Expand Down