From 9241afff09c9a150fc6c6c5e721c52622cb80852 Mon Sep 17 00:00:00 2001
From: Rahix <rahix@rahix.de>
Date: Sun, 16 Jun 2019 20:36:58 +0200
Subject: [PATCH] build(micropython): Improve version.h generator

Signed-off-by: Rahix <rahix@rahix.de>
---
 hw-tests/upy-minimal/meson.build | 7 +------
 lib/micropython/meson.build      | 7 +++++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/hw-tests/upy-minimal/meson.build b/hw-tests/upy-minimal/meson.build
index d674b5df..b38cf952 100644
--- a/hw-tests/upy-minimal/meson.build
+++ b/hw-tests/upy-minimal/meson.build
@@ -13,12 +13,7 @@ modsrc = files(
 version_h = custom_target(
   'mpversion.h',
   output: 'mpversion.h',
-  command: [
-    micropython_gen_version,
-    python3,
-    micropython_dir,
-    '@OUTPUT@',
-  ],
+  command: [micropython_gen_version, '@OUTPUT@'],
 )
 
 modules_h = custom_target(
diff --git a/lib/micropython/meson.build b/lib/micropython/meson.build
index 27b84703..bca808fa 100644
--- a/lib/micropython/meson.build
+++ b/lib/micropython/meson.build
@@ -5,8 +5,11 @@ micropython_gen_modules = [
   meson.current_source_dir(),
 ]
 
-micropython_dir = meson.current_source_dir()
-micropython_gen_version = files('./gen-version.sh')
+micropython_gen_version = [
+  files('./gen-version.sh'),
+  python3,
+  meson.current_source_dir(),
+]
 
 micropython_gen_qstr = [
   files('gen-qstr.sh'),
-- 
GitLab