diff options
| author | Yonatan Goldschmidt <yon.goldschmidt@gmail.com> | 2019-12-12 00:09:20 +0200 |
|---|---|---|
| committer | Yonatan Goldschmidt <yon.goldschmidt@gmail.com> | 2021-06-28 01:50:00 +0300 |
| commit | 4ada56d4cb4c518d2a78f7d7a600a4537188310a (patch) | |
| tree | 3bb60552edbe687c2cddd6c6e5132907399c4bb0 | |
| parent | 7ec95c2768793c28351d13a9c471991bb2d6dcff (diff) | |
tools/makemanifest.py: Allow passing flags to mpy-tool.py.
| -rw-r--r-- | py/mkrules.mk | 2 | ||||
| -rw-r--r-- | tools/makemanifest.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/py/mkrules.mk b/py/mkrules.mk index b8d07ef56..038a49329 100644 --- a/py/mkrules.mk +++ b/py/mkrules.mk @@ -139,7 +139,7 @@ $(HEADER_BUILD): ifneq ($(FROZEN_MANIFEST),) # to build frozen_content.c from a manifest $(BUILD)/frozen_content.c: FORCE $(BUILD)/genhdr/qstrdefs.generated.h - $(Q)$(MAKE_MANIFEST) -o $@ -v "MPY_DIR=$(TOP)" -v "MPY_LIB_DIR=$(MPY_LIB_DIR)" -v "PORT_DIR=$(shell pwd)" -v "BOARD_DIR=$(BOARD_DIR)" -b "$(BUILD)" $(if $(MPY_CROSS_FLAGS),-f"$(MPY_CROSS_FLAGS)",) $(FROZEN_MANIFEST) + $(Q)$(MAKE_MANIFEST) -o $@ -v "MPY_DIR=$(TOP)" -v "MPY_LIB_DIR=$(MPY_LIB_DIR)" -v "PORT_DIR=$(shell pwd)" -v "BOARD_DIR=$(BOARD_DIR)" -b "$(BUILD)" $(if $(MPY_CROSS_FLAGS),-f"$(MPY_CROSS_FLAGS)",) --mpy-tool-flags="$(MPY_TOOL_FLAGS)" $(FROZEN_MANIFEST) ifneq ($(FROZEN_DIR),) $(error FROZEN_DIR cannot be used in conjunction with FROZEN_MANIFEST) diff --git a/tools/makemanifest.py b/tools/makemanifest.py index 51de01dd8..7897a83c6 100644 --- a/tools/makemanifest.py +++ b/tools/makemanifest.py @@ -248,6 +248,7 @@ def main(): "-f", "--mpy-cross-flags", default="", help="flags to pass to mpy-cross" ) cmd_parser.add_argument("-v", "--var", action="append", help="variables to substitute") + cmd_parser.add_argument("--mpy-tool-flags", default="", help="flags to pass to mpy-tool") cmd_parser.add_argument("files", nargs="+", help="input manifest list") args = cmd_parser.parse_args() @@ -341,6 +342,7 @@ def main(): "-q", args.build_dir + "/genhdr/qstrdefs.preprocessed.h", ] + + args.mpy_tool_flags.split() + mpy_files ) if res != 0: |