diff options
| author | MikeTeachman <mike.teachman@gmail.com> | 2020-03-03 11:21:13 -0800 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2020-03-05 10:26:31 +1100 |
| commit | 8db5d2d1f13aa6413be11bc13c94df72296a0070 (patch) | |
| tree | fc5bfc75610a7d60da4c9dfc1f0909fedeae85da /tools | |
| parent | 3e0b46b9af8b7a6934b7ac68671ef8f55be2b848 (diff) | |
tools/makemanifest.py: Fix build on Windows by adding .exe to mpy-cross.
When using a manifest on Windows the reference to mpy-cross compiler was
missing the .exe file extension, so add it when appropriate.
Also allow the default path to mpy-cross to be overridden by the (optional)
MICROPY_MPYCROSS environment variable, to allow full flexibility on any OS.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/makemanifest.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/makemanifest.py b/tools/makemanifest.py index a8b310ad6..2cee6aebc 100644 --- a/tools/makemanifest.py +++ b/tools/makemanifest.py @@ -235,6 +235,9 @@ def main(): # Get paths to tools MAKE_FROZEN = VARS["MPY_DIR"] + "/tools/make-frozen.py" MPY_CROSS = VARS["MPY_DIR"] + "/mpy-cross/mpy-cross" + if sys.platform == "win32": + MPY_CROSS += ".exe" + MPY_CROSS = os.getenv("MICROPY_MPYCROSS", MPY_CROSS) MPY_TOOL = VARS["MPY_DIR"] + "/tools/mpy-tool.py" # Ensure mpy-cross is built |