diff options
| author | Ben Craig <ben.craig@ni.com> | 2017-05-09 01:34:12 +0000 |
|---|---|---|
| committer | Ben Craig <ben.craig@ni.com> | 2017-05-09 01:34:12 +0000 |
| commit | bb497d3895671d797816fc0be60e526a29cfd44f (patch) | |
| tree | 5f86b931b254c1d042884df3a220d03a09c680df /libcxx/utils | |
| parent | ff63090b0e1072bd398b8efef8ae2291613a6ec9 (diff) | |
| download | bcm5719-llvm-bb497d3895671d797816fc0be60e526a29cfd44f.tar.gz bcm5719-llvm-bb497d3895671d797816fc0be60e526a29cfd44f.zip | |
Fix Windows tests when __config_site is present.
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.
llvm-svn: 302497
Diffstat (limited to 'libcxx/utils')
| -rw-r--r-- | libcxx/utils/libcxx/test/config.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/utils/libcxx/test/config.py b/libcxx/utils/libcxx/test/config.py index 7f1ae851b9c..47784348d10 100644 --- a/libcxx/utils/libcxx/test/config.py +++ b/libcxx/utils/libcxx/test/config.py @@ -546,6 +546,7 @@ class Configuration(object): def configure_compile_flags_header_includes(self): support_path = os.path.join(self.libcxx_src_root, 'test', 'support') + self.configure_config_site_header() if self.cxx_stdlib_under_test != 'libstdc++' and \ not self.is_windows: self.cxx.compile_flags += [ @@ -561,7 +562,6 @@ class Configuration(object): '-include', os.path.join(support_path, 'set_windows_crt_report_mode.h') ] - self.configure_config_site_header() cxx_headers = self.get_lit_conf('cxx_headers') if cxx_headers == '' or (cxx_headers is None and self.cxx_stdlib_under_test != 'libc++'): |
