diff options
| author | Pete Johanson <peter@peterjohanson.com> | 2020-04-13 16:44:27 +0000 |
|---|---|---|
| committer | skullydazed <skullydazed@users.noreply.github.com> | 2020-04-13 10:48:27 -0700 |
| commit | 6fb048fdafe58897f64efa8c4b9455bbcb992110 (patch) | |
| tree | efb1d542d362d17df471b86963c2a6787c2e7614 /lib/python/qmk/commands.py | |
| parent | 06b571aa53940b278e4359136e4b7d78cf4594f9 (diff) | |
| download | qmk_firmware-6fb048fdafe58897f64efa8c4b9455bbcb992110.tar.gz qmk_firmware-6fb048fdafe58897f64efa8c4b9455bbcb992110.zip | |
CLI: Use `shutil.which` to detect gmake, instead of OS check.
Diffstat (limited to 'lib/python/qmk/commands.py')
| -rw-r--r-- | lib/python/qmk/commands.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/python/qmk/commands.py b/lib/python/qmk/commands.py index 1fdca1943..5d2a03c9a 100644 --- a/lib/python/qmk/commands.py +++ b/lib/python/qmk/commands.py | |||
| @@ -5,6 +5,7 @@ import os | |||
| 5 | import platform | 5 | import platform |
| 6 | import subprocess | 6 | import subprocess |
| 7 | import shlex | 7 | import shlex |
| 8 | import shutil | ||
| 8 | 9 | ||
| 9 | import qmk.keymap | 10 | import qmk.keymap |
| 10 | 11 | ||
| @@ -28,11 +29,7 @@ def create_make_command(keyboard, keymap, target=None): | |||
| 28 | A command that can be run to make the specified keyboard and keymap | 29 | A command that can be run to make the specified keyboard and keymap |
| 29 | """ | 30 | """ |
| 30 | make_args = [keyboard, keymap] | 31 | make_args = [keyboard, keymap] |
| 31 | make_cmd = 'make' | 32 | make_cmd = 'gmake' if shutil.which('gmake') else 'make' |
| 32 | |||
| 33 | platform_id = platform.platform().lower() | ||
| 34 | if 'freebsd' in platform_id: | ||
| 35 | make_cmd = 'gmake' | ||
| 36 | 33 | ||
| 37 | if target: | 34 | if target: |
| 38 | make_args.append(target) | 35 | make_args.append(target) |
