Revert "Fix Windows tests when __config_site is present."
It's 2017, and line endings are still an issue. llvm-svn: 302496
This commit is contained in:
parent
855d70cb67
commit
ff63090b0e
|
@ -546,7 +546,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.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 += [
|
||||||
|
@ -562,6 +561,7 @@ 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++'):
|
||||||
|
|
Loading…
Reference in New Issue