diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-11-26 12:29:12 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-12-02 16:39:06 -0800 |
| commit | ab5ea9e8b60f043551a2920f70d6f3a1532d5bf8 (patch) | |
| tree | 12065713efb775753f9331ebac1fbaf08263b550 /mesonbuild/environment.py | |
| parent | 32e0bcc516e2a6160a4884ae250e817dde3fed2a (diff) | |
| download | meson-ab5ea9e8b60f043551a2920f70d6f3a1532d5bf8.zip meson-ab5ea9e8b60f043551a2920f70d6f3a1532d5bf8.tar.gz meson-ab5ea9e8b60f043551a2920f70d6f3a1532d5bf8.tar.bz2 | |
environment: unify platform detection logic
I noticed this while I was here, it's not much, just a small cleanup to
the platform detection logic.
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 47fb9f1..83c6935 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -1418,8 +1418,7 @@ class Environment: if 'LLVM D compiler' in out: # LDC seems to require a file - m = self.machines[for_machine] - if m.is_windows() or m.is_cygwin(): + if info.is_windows() or info.is_cygwin(): # Getting LDC on windows to give useful linker output when # not doing real work is painfully hard. It ships with a # version of lld-link, so unless we think the user wants @@ -1443,8 +1442,7 @@ class Environment: full_version=full_version, linker=linker) elif 'The D Language Foundation' in out or 'Digital Mars' in out: # DMD seems to require a file - m = self.machines[for_machine] - if m.is_windows() or m.is_cygwin(): + if info.is_windows() or info.is_cygwin(): if is_msvc: linker_cmd = ['link'] elif arch == 'x86': |