LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweak --param=no_default_flags=true to still add -Ilibcxx/test/support

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@268801 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2016-05-06 21:35:06 +00:00
parent 35ff03b7c2
commit 70487694ba
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -293,6 +293,10 @@ class Configuration(object):
no_default_flags = self.get_lit_bool('no_default_flags', False) no_default_flags = self.get_lit_bool('no_default_flags', False)
if not no_default_flags: if not no_default_flags:
self.configure_default_compile_flags() self.configure_default_compile_flags()
# This include is always needed so add so add it regardless of
# 'no_default_flags'.
support_path = os.path.join(self.libcxx_src_root, 'test/support')
self.cxx.compile_flags += ['-I' + support_path]
# Configure extra flags # Configure extra flags
compile_flags_str = self.get_lit_conf('compile_flags', '') compile_flags_str = self.get_lit_conf('compile_flags', '')
self.cxx.compile_flags += shlex.split(compile_flags_str) self.cxx.compile_flags += shlex.split(compile_flags_str)
@@ -341,7 +345,6 @@ class Configuration(object):
def configure_compile_flags_header_includes(self): def configure_compile_flags_header_includes(self):
support_path = os.path.join(self.libcxx_src_root, 'test/support') support_path = os.path.join(self.libcxx_src_root, 'test/support')
self.cxx.compile_flags += ['-I' + support_path]
self.cxx.compile_flags += ['-include', os.path.join(support_path, 'nasty_macros.hpp')] self.cxx.compile_flags += ['-include', os.path.join(support_path, 'nasty_macros.hpp')]
self.configure_config_site_header() self.configure_config_site_header()
libcxx_headers = self.get_lit_conf( libcxx_headers = self.get_lit_conf(