djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

esp8266, stmhal, unix: MAKE_FROZEN is consistently defined in mkenv.mk.

Browse Source
This commit is contained in:
Paul Sokolovsky 2016-10-16 10:48:42 +03:00
parent 06234a6115
commit 799ccdc789
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
esp8266/Makefile
View File

@ -12,7 +12,6 @@ include ../py/py.mk
MPY_CROSS = ../mpy-cross/mpy-cross MPY_CROSS = ../mpy-cross/mpy-cross
MPY_TOOL = ../tools/mpy-tool.py MPY_TOOL = ../tools/mpy-tool.py
MAKE_FROZEN = ../tools/make-frozen.py
FROZEN_DIR = scripts FROZEN_DIR = scripts
FROZEN_MPY_DIR = modules FROZEN_MPY_DIR = modules

1
stmhal/Makefile
View File

@ -276,7 +276,6 @@ all: $(BUILD)/firmware.dfu $(BUILD)/firmware.hex
ifneq ($(FROZEN_DIR),) ifneq ($(FROZEN_DIR),)
CFLAGS += -DMICROPY_MODULE_FROZEN_STR CFLAGS += -DMICROPY_MODULE_FROZEN_STR
OBJ += $(BUILD)/frozen-files.o OBJ += $(BUILD)/frozen-files.o
MAKE_FROZEN = ../tools/make-frozen.py
$(BUILD)/frozen-files.o: $(BUILD)/frozen-files.c $(BUILD)/frozen-files.o: $(BUILD)/frozen-files.c
$(call compile_c) $(call compile_c)

2
unix/Makefile
View File

@ -273,7 +273,7 @@ coverage_test: coverage
gcov -o build-coverage/extmod ../extmod/*.c gcov -o build-coverage/extmod ../extmod/*.c
$(BUILD)/_frozen_upip.c: $(BUILD)/frozen_upip/upip.py $(BUILD)/_frozen_upip.c: $(BUILD)/frozen_upip/upip.py
../tools/make-frozen.py $(dir $^) > $@ $(MAKE_FROZEN) $(dir $^) > $@
# Select latest upip version available # Select latest upip version available
UPIP_TARBALL := $(shell ls -1 -v ../tools/micropython-upip-*.tar.gz | tail -n1) UPIP_TARBALL := $(shell ls -1 -v ../tools/micropython-upip-*.tar.gz | tail -n1)