From fcd02b85a5bada08bf6a2ee4ab5c43543c776e42 Mon Sep 17 00:00:00 2001 From: Jonathan Roelofs Date: Wed, 14 Jan 2015 21:56:50 +0000 Subject: [PATCH] Rename library_root to libcxx_library_root. NFC git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@226043 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/libcxx/test/config.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/libcxx/test/config.py b/test/libcxx/test/config.py index b6897acb8..038bd5835 100644 --- a/test/libcxx/test/config.py +++ b/test/libcxx/test/config.py @@ -19,7 +19,7 @@ class Configuration(object): self.cxx = None self.src_root = None self.obj_root = None - self.library_root = None + self.libcxx_library_root = None self.env = {} self.compile_flags = [] self.link_flags = [] @@ -144,8 +144,8 @@ class Configuration(object): self.obj_root = self.get_lit_conf('libcxx_obj_root', self.src_root) def configure_library_root(self): - self.library_root = self.get_lit_conf('libcxx_library_root', - self.obj_root) + self.libcxx_library_root = self.get_lit_conf('libcxx_library_root', + self.obj_root) def configure_use_system_lib(self): # This test suite supports testing against either the system library or @@ -344,8 +344,8 @@ class Configuration(object): self.link_flags += ['-Wl,-rpath,' + os.path.dirname(libcxx_library)] elif not self.use_system_lib: - self.link_flags += ['-L' + self.library_root, - '-Wl,-rpath,' + self.library_root] + self.link_flags += ['-L' + self.libcxx_library_root, + '-Wl,-rpath,' + self.libcxx_library_root] # Configure ABI library paths. abi_library_path = self.get_lit_conf('abi_library_path', '') if abi_library_path: @@ -474,7 +474,7 @@ class Configuration(object): if sys.platform == 'darwin' and not self.use_system_lib: libcxx_library = self.get_lit_conf('libcxx_library') if libcxx_library: - library_root = os.path.dirname(libcxx_library) + libcxx_library_root = os.path.dirname(libcxx_library) else: - library_root = self.library_root - self.env['DYLD_LIBRARY_PATH'] = library_root + libcxx_library_root = self.libcxx_library_root + self.env['DYLD_LIBRARY_PATH'] = libcxx_library_root