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

Refactor configure_link_flags for modularity. NFC

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@226174 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jonathan Roelofs 2015-01-15 16:18:13 +00:00
parent 583f2e7093
commit 88b2a86232
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -330,6 +330,20 @@ class Configuration(object):
def configure_link_flags(self): def configure_link_flags(self):
self.link_flags += ['-nodefaultlibs'] self.link_flags += ['-nodefaultlibs']
# Configure library path
self.configure_link_flags_cxx_library_path()
self.configure_link_flags_abi_library_path()
# Configure libraries
self.configure_link_flags_cxx_library()
self.configure_link_flags_abi_library()
self.configure_extra_library_flags()
link_flags_str = self.get_lit_conf('link_flags', '')
self.link_flags += shlex.split(link_flags_str)
def configure_link_flags_cxx_library_path(self):
libcxx_library = self.get_lit_conf('libcxx_library') libcxx_library = self.get_lit_conf('libcxx_library')
# Configure libc++ library paths. # Configure libc++ library paths.
if libcxx_library is not None: if libcxx_library is not None:
@ -347,20 +361,14 @@ class Configuration(object):
elif not self.use_system_cxx_lib: elif not self.use_system_cxx_lib:
self.link_flags += ['-L' + self.cxx_library_root, self.link_flags += ['-L' + self.cxx_library_root,
'-Wl,-rpath,' + self.cxx_library_root] '-Wl,-rpath,' + self.cxx_library_root]
def configure_link_flags_abi_library_path(self):
# Configure ABI library paths. # Configure ABI library paths.
abi_library_path = self.get_lit_conf('abi_library_path', '') abi_library_path = self.get_lit_conf('abi_library_path', '')
if abi_library_path: if abi_library_path:
self.link_flags += ['-L' + abi_library_path, self.link_flags += ['-L' + abi_library_path,
'-Wl,-rpath,' + abi_library_path] '-Wl,-rpath,' + abi_library_path]
# Configure libraries
self.configure_link_flags_cxx_library()
self.configure_link_flags_abi_library()
self.configure_extra_library_flags()
link_flags_str = self.get_lit_conf('link_flags', '')
self.link_flags += shlex.split(link_flags_str)
def configure_link_flags_cxx_library(self): def configure_link_flags_cxx_library(self):
libcxx_library = self.get_lit_conf('libcxx_library') libcxx_library = self.get_lit_conf('libcxx_library')
if libcxx_library: if libcxx_library: