generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove default definition for libcxx_obj_dir because it doesn't make sense

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@228778 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2015-02-11 01:03:44 +00:00
parent f42a8e6003
commit 1a633ca404
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/libcxx/test/config.py
View File

@@ -48,7 +48,7 @@ class Configuration(object):
self.config = config
self.cxx = None
self.libcxx_src_root = None
self.obj_root = None
self.libcxx_obj_root = None
self.cxx_library_root = None
self.env = {}
self.use_target = False
@@ -146,12 +146,11 @@ class Configuration(object):
'libcxx_src_root', os.path.dirname(self.config.test_source_root))
def configure_obj_root(self):
self.obj_root = self.get_lit_conf('libcxx_obj_root',
self.libcxx_src_root)
self.libcxx_obj_root = self.get_lit_conf('libcxx_obj_root')
def configure_cxx_library_root(self):
self.cxx_library_root = self.get_lit_conf('cxx_library_root',
self.obj_root)
self.libcxx_obj_root)
def configure_use_system_cxx_lib(self):
# This test suite supports testing against either the system library or
@@ -403,7 +402,7 @@ class Configuration(object):
"with 'use_system_cxx_lib=true'")
self.cxx.link_flags += ['-Wl,-rpath,' +
os.path.dirname(libcxx_library)]
elif not self.use_system_cxx_lib:
elif not self.use_system_cxx_lib and self.cxx_library_root:
self.cxx.link_flags += ['-L' + self.cxx_library_root,
'-Wl,-rpath,' + self.cxx_library_root]
@@ -580,4 +579,5 @@ class Configuration(object):
cxx_library_root = os.path.dirname(libcxx_library)
else:
cxx_library_root = self.cxx_library_root
self.env['DYLD_LIBRARY_PATH'] = cxx_library_root
if cxx_library_root:
self.env['DYLD_LIBRARY_PATH'] = cxx_library_root