diff options
| -rw-r--r-- | libcxx/docs/TestingLibcxx.rst | 2 | ||||
| -rw-r--r-- | libcxx/utils/libcxx/test/config.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libcxx/docs/TestingLibcxx.rst b/libcxx/docs/TestingLibcxx.rst index 8f0d98510d1..43c0684dc7d 100644 --- a/libcxx/docs/TestingLibcxx.rst +++ b/libcxx/docs/TestingLibcxx.rst @@ -112,7 +112,7 @@ configuration. Passing the option on the command line will override the default. .. option:: std=<standard version> - **Values**: c++98, c++03, c++11, c++14, c++17 + **Values**: c++98, c++03, c++11, c++14, c++17, c++2a Change the standard version used when building the tests. diff --git a/libcxx/utils/libcxx/test/config.py b/libcxx/utils/libcxx/test/config.py index 0d907d7f59a..4ed67c2238f 100644 --- a/libcxx/utils/libcxx/test/config.py +++ b/libcxx/utils/libcxx/test/config.py @@ -517,7 +517,8 @@ class Configuration(object): std = self.get_lit_conf('std') if not std: # Choose the newest possible language dialect if none is given. - possible_stds = ['c++17', 'c++1z', 'c++14', 'c++11', 'c++03'] + possible_stds = ['c++2a', 'c++17', 'c++1z', 'c++14', 'c++11', + 'c++03'] if self.cxx.type == 'gcc': maj_v, _, _ = self.cxx.version maj_v = int(maj_v) @@ -888,7 +889,7 @@ class Configuration(object): # Turn on warnings by default for Clang based compilers when C++ >= 11 default_enable_warnings = self.cxx.type in ['clang', 'apple-clang'] \ and len(self.config.available_features.intersection( - ['c++11', 'c++14', 'c++17'])) != 0 + ['c++11', 'c++14', 'c++17', 'c++2a'])) != 0 enable_warnings = self.get_lit_bool('enable_warnings', default_enable_warnings) self.cxx.useWarnings(enable_warnings) |
