diff options
author | Eric Fiselier <eric@efcs.ca> | 2015-03-17 18:58:14 +0000 |
---|---|---|
committer | Eric Fiselier <eric@efcs.ca> | 2015-03-17 18:58:14 +0000 |
commit | 9ac9cddabcb1f0c067d39378775fd1444165239b (patch) | |
tree | 90e9833a89ac8889ebf1e03896d86399f8eaa80a /test | |
parent | 7c79ceb7296086ff84d442c74e846075d0d906eb (diff) |
add option to tell LIT where to find the libc++ library when built out of tree
git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@232518 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test')
-rw-r--r-- | test/libcxxabi/test/config.py | 9 | ||||
-rw-r--r-- | test/lit.site.cfg.in | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/test/libcxxabi/test/config.py b/test/libcxxabi/test/config.py index d08aff8..a8c993f 100644 --- a/test/libcxxabi/test/config.py +++ b/test/libcxxabi/test/config.py @@ -76,5 +76,10 @@ class Configuration(LibcxxConfiguration): self.cxx.link_flags += ['-lc++abi'] def configure_env(self): - if sys.platform == 'darwin' and self.libcxxabi_lib_root: - self.env['DYLD_LIBRARY_PATH'] = self.libcxxabi_lib_root + library_paths = [] + if self.libcxxabi_lib_root: + library_paths += [self.libcxxabi_lib_root] + if self.cxx_library_root: + library_paths += [self.cxx_library_root] + if sys.platform == 'darwin' and library_paths: + self.env['DYLD_LIBRARY_PATH'] = ':'.join(library_paths) diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in index c033dbb..836ad90 100644 --- a/test/lit.site.cfg.in +++ b/test/lit.site.cfg.in @@ -5,6 +5,7 @@ config.libcxxabi_obj_root = "@LIBCXXABI_BINARY_DIR@" config.libcxxabi_lib_root = "@LIBCXXABI_LIBRARY_DIR@" config.libcxx_src_root = "@LIBCXXABI_LIBCXX_PATH@" config.cxx_headers = "@LIBCXXABI_LIBCXX_INCLUDES@" +config.cxx_library_root = "@LIBCXXABI_LIBCXX_LIBRARY_PATH@" config.llvm_unwinder = "@LIBCXXABI_USE_LLVM_UNWINDER@" config.enable_threads = "@LIBCXXABI_ENABLE_THREADS@" config.use_sanitizer = "@LLVM_USE_SANITIZER@" |