diff options
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/test/libcxx/test/config.py | 3 | ||||
| -rw-r--r-- | libcxx/test/support/disable_missing_braces_warning.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libcxx/test/libcxx/test/config.py b/libcxx/test/libcxx/test/config.py index c8771999dd7..5fcb8f4a9b3 100644 --- a/libcxx/test/libcxx/test/config.py +++ b/libcxx/test/libcxx/test/config.py @@ -217,8 +217,7 @@ class Configuration(object): def _configure_clang_cl(self, clang_path): assert self.cxx_is_clang_cl # FIXME: don't hardcode the target - flags = ['-fms-compatibility-version=19.00', - '--target=i686-unknown-windows'] + flags = ['--target=i686-pc-windows'] compile_flags = [] link_flags = ['-fuse-ld=lld'] if 'INCLUDE' in os.environ: diff --git a/libcxx/test/support/disable_missing_braces_warning.h b/libcxx/test/support/disable_missing_braces_warning.h index c53eef8a951..ac8b4072815 100644 --- a/libcxx/test/support/disable_missing_braces_warning.h +++ b/libcxx/test/support/disable_missing_braces_warning.h @@ -13,6 +13,8 @@ // Disable the missing braces warning for this reason. #if defined(__GNUC__) #pragma GCC diagnostic ignored "-Wmissing-braces" +#elif defined(__clang__) +#pragma clang diagnostic ignored "-Wmissing-braces" #endif #endif // SUPPORT_DISABLE_MISSING_BRACES_WARNING_H |
