diff options
| author | avitex <theavitex@gmail.com> | 2021-10-21 17:24:21 +1100 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2021-10-30 23:22:48 -0400 |
| commit | 2046593825d03c348fb09430e38145d92d9d6b94 (patch) | |
| tree | a5f0be90af46a104eb5e6774fe9441a95bbbb75f | |
| parent | 2c079d855ed87488bdcc6c5c06f59abdb9b85b6c (diff) | |
| download | meson-2046593825d03c348fb09430e38145d92d9d6b94.zip meson-2046593825d03c348fb09430e38145d92d9d6b94.tar.gz meson-2046593825d03c348fb09430e38145d92d9d6b94.tar.bz2 | |
delete PLATFORM env only if set
fixes #8721
| -rw-r--r-- | mesonbuild/mcompile.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/mcompile.py b/mesonbuild/mcompile.py index 536fccb..ccb2f0b 100644 --- a/mesonbuild/mcompile.py +++ b/mesonbuild/mcompile.py @@ -224,9 +224,10 @@ def get_parsed_args_vs(options: 'argparse.Namespace', builddir: Path) -> T.Tuple cmd += options.vs_args - # Remove platform from env so that msbuild does not pick x86 platform when solution platform is Win32 + # Remove platform from env if set so that msbuild does not + # pick x86 platform when solution platform is Win32 env = os.environ.copy() - del env['PLATFORM'] + env.pop('PLATFORM', None) return cmd, env |