diff options
| author |  Gediminas Jakutis <gediminas@varciai.lt>
| 2019-05-29 11:55:38 +0300 |
|---|---|---|
| committer | Gediminas Jakutis <gediminas@varciai.lt>
| 2019-05-29 11:55:38 +0300 |
| commit | a7c5c9ed96462d1b28139c04fba679403a412164 (patch) | |
| tree | c6ec61e68b98536699f69c3dbc24185b6075b3d0 /src | |
| parent | ca13d9553aac09ca1205b29613c2035ebc0bf3e2 (diff) | |
| download | usurpation-a7c5c9ed96462d1b28139c04fba679403a412164.tar.gz usurpation-a7c5c9ed96462d1b28139c04fba679403a412164.tar.bz2 usurpation-a7c5c9ed96462d1b28139c04fba679403a412164.zip | |
device: meson: fix some oversights.
espmake is not used anymore, so removed the find_program() of it.
Lack of nproc is now handled gracefully and won't make it error out.
Signed-off-by: Gediminas Jakutis <gediminas@varciai.lt>
Diffstat (limited to 'src')
| -rw-r--r-- | src/device/meson.build | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/device/meson.build b/src/device/meson.build index 10723b0..625bd2d 100644 --- a/src/device/meson.build +++ b/src/device/meson.build @@ -22,15 +22,18 @@ if get_option('fwbuild') assert((oledlib != []), 'oled lib not found in the supplied lib directory') - espmake = find_program('espmake') printf = find_program('printf') cat = find_program('cat') cp = find_program('cp') make = find_program('make') - nproc = find_program('nproc') + nproc = find_program('nproc', disabler : true) - nproc_out = run_command(nproc) - cpus = nproc_out.stdout().strip() + if nproc.found() + nproc_out = run_command(nproc) + cpus = nproc_out.stdout().strip() + else + cpus = '2' + endif fw_filenames = ['main.ino', 'DejaVu_Sans_Mono_13.h', |