mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tools/makemanifest.py: Allow passing flags to mpy-tool.py.

This commit is contained in:
Yonatan Goldschmidt 2019-12-12 00:09:20 +02:00
parent 7ec95c2768
commit 4ada56d4cb
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
py/mkrules.mk
View File

@ -139,7 +139,7 @@ $(HEADER_BUILD):
ifneq ($(FROZEN_MANIFEST),) ifneq ($(FROZEN_MANIFEST),)
# to build frozen_content.c from a manifest # to build frozen_content.c from a manifest
$(BUILD)/frozen_content.c: FORCE $(BUILD)/genhdr/qstrdefs.generated.h $(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),) ifneq ($(FROZEN_DIR),)
$(error FROZEN_DIR cannot be used in conjunction with FROZEN_MANIFEST) $(error FROZEN_DIR cannot be used in conjunction with FROZEN_MANIFEST)

2
tools/makemanifest.py
View File

@ -248,6 +248,7 @@ def main():
"-f", "--mpy-cross-flags", default="", help="flags to pass to mpy-cross" "-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("-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") cmd_parser.add_argument("files", nargs="+", help="input manifest list")
args = cmd_parser.parse_args() args = cmd_parser.parse_args()
@ -341,6 +342,7 @@ def main():
"-q", "-q",
args.build_dir + "/genhdr/qstrdefs.preprocessed.h", args.build_dir + "/genhdr/qstrdefs.preprocessed.h",
] ]
+ args.mpy_tool_flags.split()
+ mpy_files + mpy_files
) )
if res != 0: if res != 0: