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

Jongy · Jongy · commit 360b9b2bfe42 · 2021-06-24T22:08:46.000+03:00
Use it to remain with the default MPZ_DIG_SIZE = 32 on 64-bit builds.
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
@@ -267,7 +267,9 @@ ifneq ($(FROZEN_MANIFEST)$(FROZEN_MPY_DIR),)
 # freeze, then invoke make with FROZEN_MANIFEST=manifest.py (be sure to build from scratch).
 CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
 CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
-CFLAGS += -DMPZ_DIG_SIZE=16 # force 16 bits to work on both 32 and 64 bit archs
+ifneq ($(MICROPY_FORCE_32BIT),1)
+MPY_TOOL_FLAGS += "-mmpz-dig-size=32"
+endif
 MPY_CROSS_FLAGS += -mcache-lookup-bc
 endif
 
diff --git 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)",) $(if $(MPY_TOOL_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
@@ -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:

Original file line number	Diff line number	Diff line change
`@@ -248,6 +248,7 @@ def main():`
`248`	`248`	`"-f", "--mpy-cross-flags", default="", help="flags to pass to mpy-cross"`
`249`	`249`	`)`
`250`	`250`	`cmd_parser.add_argument("-v", "--var", action="append", help="variables to substitute")`
	`251`	`+ cmd_parser.add_argument('--mpy-tool-flags', default='', help='flags to pass to mpy-tool')`
`251`	`252`	`cmd_parser.add_argument("files", nargs="+", help="input manifest list")`
`252`	`253`	`args = cmd_parser.parse_args()`
`253`	`254`
`@@ -341,6 +342,7 @@ def main():`
`341`	`342`	`"-q",`
`342`	`343`	`args.build_dir + "/genhdr/qstrdefs.preprocessed.h",`
`343`	`344`	`]`
	`345`	`+ + args.mpy_tool_flags.split()`
`344`	`346`	`+ mpy_files`
`345`	`347`	`)`
`346`	`348`	`if res != 0:`