diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2021-08-15 11:33:57 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-08-15 13:18:35 +0300 |
| commit | a90d2925ddfa4e1a19197ca39df8e73d7af6e689 (patch) | |
| tree | 83ea1690eccc787dab83eb1ed7bd1a264c9b362e /mesonbuild | |
| parent | 00bfbcbfa2a5c59f790962b3b1f7e1088fe08947 (diff) | |
| download | meson-a90d2925ddfa4e1a19197ca39df8e73d7af6e689.zip meson-a90d2925ddfa4e1a19197ca39df8e73d7af6e689.tar.gz meson-a90d2925ddfa4e1a19197ca39df8e73d7af6e689.tar.bz2 | |
Revert "compilers/c++: Add MSVC option to make the __cplusplus define accurate"
This reverts commit 0b97d585480e973d8b149618901f7a4ddfa1a906.
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/compilers/cpp.py | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py index 057a39a..44155d1 100644 --- a/mesonbuild/compilers/cpp.py +++ b/mesonbuild/compilers/cpp.py @@ -692,17 +692,6 @@ class VisualStudioCPPCompiler(CPP11AsCPP14Mixin, VisualStudioLikeCPPCompilerMixi del args[i] return args - def get_always_args(self) -> T.List[str]: - args = super().get_always_args() - - # update the __cplusplus #define to match the version given on the - # command line with /std:NNN, but only for versions above 15.7 (2017) - # https://docs.microsoft.com/en-us/cpp/build/reference/zc-cplusplus?view=msvc-160 - if version_compare(self.version, '>= 15.7'): - args.append('/Zc:__cplusplus') - - return args - class ClangClCPPCompiler(CPP11AsCPP14Mixin, VisualStudioLikeCPPCompilerMixin, ClangClCompiler, CPPCompiler): def __init__(self, exelist: T.List[str], version: str, for_machine: MachineChoice, is_cross: bool, info: 'MachineInfo', target: str, |