maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Unify and cleanup rpath handling in tests. 

llvm-svn: 223594
This commit is contained in:
Eric Fiselier 2014-12-06 22:08:51 +00:00
parent b92da3f217
commit a1c73a6d6d
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libcxx/test/lit.cfg
View File

@ -234,7 +234,6 @@ class Configuration(object):
self.configure_obj_root() self.configure_obj_root()
self.configure_use_system_lib() self.configure_use_system_lib()
self.configure_use_clang_verify() self.configure_use_clang_verify()
self.configure_env()
self.configure_std_flag() self.configure_std_flag()
self.configure_compile_flags() self.configure_compile_flags()
self.configure_link_flags() self.configure_link_flags()
@ -444,12 +443,12 @@ class Configuration(object):
def configure_link_flags(self): def configure_link_flags(self):
# Configure library search paths # Configure library search paths
abi_library_path = self.get_lit_conf('abi_library_path', '') abi_library_path = self.get_lit_conf('abi_library_path', '')
self.link_flags += ['-L' + self.obj_root + '/lib']
if not self.use_system_lib: if not self.use_system_lib:
self.link_flags += ['-Wl,-rpath', '-Wl,' + self.obj_root + '/lib'] self.link_flags += ['-L' + self.obj_root + '/lib']
self.link_flags += ['-Wl,-rpath,' + self.obj_root + '/lib']
if abi_library_path: if abi_library_path:
self.link_flags += ['-L' + abi_library_path, self.link_flags += ['-L' + abi_library_path,
'-Wl,-rpath', '-Wl,' + abi_library_path] '-Wl,-rpath,' + abi_library_path]
# Configure libraries # Configure libraries
self.link_flags += ['-lc++'] self.link_flags += ['-lc++']
link_flags_str = self.get_lit_conf('link_flags') link_flags_str = self.get_lit_conf('link_flags')
@ -559,12 +558,6 @@ class Configuration(object):
self.lit_config.note( self.lit_config.note(
"inferred target_triple as: %r" % self.config.target_triple) "inferred target_triple as: %r" % self.config.target_triple)
def configure_env(self):
# Configure extra linker parameters.
if sys.platform == 'darwin':
if not self.use_system_lib:
self.env['DYLD_LIBRARY_PATH'] = os.path.join(self.obj_root,
'lib')
# name: The name of this test suite. # name: The name of this test suite.