diff options
| author | Eric Fiselier <eric@efcs.ca> | 2015-02-11 01:07:48 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2015-02-11 01:07:48 +0000 |
| commit | 200599c6bf74230d6bc6b38320a0a570e4a556b8 (patch) | |
| tree | 1b42b13addd299a9fab41d82d038e7b1f19e7457 /test/libcxxabi | |
| parent | 2af79a53c069637e9530302bc06ad200b49ae90b (diff) | |
Fix libcxxabi's library and object root for tests.
git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@228779 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/libcxxabi')
| -rw-r--r-- | test/libcxxabi/test/config.py | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/test/libcxxabi/test/config.py b/test/libcxxabi/test/config.py index 52cdcbd..a761c37 100644 --- a/test/libcxxabi/test/config.py +++ b/test/libcxxabi/test/config.py @@ -9,8 +9,9 @@ class Configuration(LibcxxConfiguration): def __init__(self, lit_config, config): super(Configuration, self).__init__(lit_config, config) self.libcxxabi_src_root = None + self.libcxxabi_obj_root = None + self.libcxxabi_lib_root = None self.libcxx_src_root = None - self.obj_root = None def configure_src_root(self): self.libcxxabi_src_root = self.get_lit_conf( @@ -21,8 +22,10 @@ class Configuration(LibcxxConfiguration): os.path.join(self.libcxxabi_src_root, '/../libcxx')) def configure_obj_root(self): - self.obj_root = self.get_lit_conf('libcxxabi_obj_root', - self.libcxxabi_src_root) + self.libcxxabi_obj_root = self.get_lit_conf('libcxxabi_obj_root') + self.libcxxabi_lib_root = self.get_lit_conf('libcxxabi_lib_root', + self.libcxxabi_obj_root) + super(Configuration, self).configure_obj_root() def configure_compile_flags(self): self.cxx.compile_flags += ['-DLIBCXXABI_NO_TIMER'] @@ -59,9 +62,10 @@ class Configuration(LibcxxConfiguration): def configure_link_flags_abi_library_path(self): # Configure ABI library paths. - self.cxx.link_flags += ['-L' + self.obj_root, - '-Wl,-rpath,' + self.obj_root] + if self.libcxxabi_lib_root: + self.cxx.link_flags += ['-L' + self.libcxxabi_lib_root, + '-Wl,-rpath,' + self.libcxxabi_lib_root] def configure_env(self): - if sys.platform == 'darwin': - self.env['DYLD_LIBRARY_PATH'] = self.obj_root + if sys.platform == 'darwin' and self.libcxxabi_lib_root: + self.env['DYLD_LIBRARY_PATH'] = self.libcxxabi_lib_root |