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

Fix Windows tests when __config_site is present.

Browse Source 
Previously, the force includes would complain about a missing _DEBUG symbol.
Now we dump macros before adding the force includes to the command line.
Now with proper newlines.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@302497 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Ben Craig
2017-05-09 01:34:12 +00:00
parent 2a1cb9c2e6
commit c6aa3e7963
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/libcxx/test/config.py
View File

@@ -546,6 +546,7 @@ 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.configure_config_site_header()
if self.cxx_stdlib_under_test != 'libstdc++' and \ if self.cxx_stdlib_under_test != 'libstdc++' and \
not self.is_windows: not self.is_windows:
self.cxx.compile_flags += [ self.cxx.compile_flags += [
@@ -561,7 +562,6 @@ class Configuration(object):
'-include', os.path.join(support_path, '-include', os.path.join(support_path,
'set_windows_crt_report_mode.h') 'set_windows_crt_report_mode.h')
] ]
self.configure_config_site_header()
cxx_headers = self.get_lit_conf('cxx_headers') cxx_headers = self.get_lit_conf('cxx_headers')
if cxx_headers == '' or (cxx_headers is None if cxx_headers == '' or (cxx_headers is None
and self.cxx_stdlib_under_test != 'libc++'): and self.cxx_stdlib_under_test != 'libc++'):