diff options
| author | Damien George <damien.p.george@gmail.com> | 2016-08-31 15:12:57 +1000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2016-08-31 15:12:57 +1000 |
| commit | 9c04ef2a6772cabbd92abe6c826b56cc04a1a7b8 (patch) | |
| tree | cabc79704528f94c0feea1b14bae4a13781f9f75 | |
| parent | 1f61fe07a2bca5374fdb402a41785a81b193f5ed (diff) | |
| download | micropython-9c04ef2a6772cabbd92abe6c826b56cc04a1a7b8.tar.gz micropython-9c04ef2a6772cabbd92abe6c826b56cc04a1a7b8.zip | |
unix,stmhal,esp8266: When find'ing frozen files don't use extra slash.
This extra forward slash for the starting-point directory is unnecessary
and leads to additional slashes on Max OS X which mean that the frozen
files cannot be imported.
Fixes #2374.
| -rw-r--r-- | esp8266/Makefile | 2 | ||||
| -rw-r--r-- | stmhal/Makefile | 2 | ||||
| -rw-r--r-- | unix/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/esp8266/Makefile b/esp8266/Makefile index 7da83f1aaf..2786510388 100644 --- a/esp8266/Makefile +++ b/esp8266/Makefile @@ -141,7 +141,7 @@ DRIVERS_SRC_C = $(addprefix drivers/,\ SRC_S = \ gchelper.s \ -FROZEN_MPY_PY_FILES := $(shell find $(FROZEN_MPY_DIR)/ -type f -name '*.py') +FROZEN_MPY_PY_FILES := $(shell find $(FROZEN_MPY_DIR) -type f -name '*.py') FROZEN_MPY_MPY_FILES := $(addprefix $(BUILD)/,$(FROZEN_MPY_PY_FILES:.py=.mpy)) OBJ = diff --git a/stmhal/Makefile b/stmhal/Makefile index 1ad2783fca..2c6ea806eb 100644 --- a/stmhal/Makefile +++ b/stmhal/Makefile @@ -284,7 +284,7 @@ endif ifneq ($(FROZEN_MPY_DIR),) # To use frozen bytecode, put your .py files in a subdirectory (eg frozen/) and # then invoke make with FROZEN_MPY_DIR=frozen (be sure to build from scratch). -FROZEN_MPY_PY_FILES := $(shell find $(FROZEN_MPY_DIR)/ -type f -name '*.py') +FROZEN_MPY_PY_FILES := $(shell find $(FROZEN_MPY_DIR) -type f -name '*.py') FROZEN_MPY_MPY_FILES := $(addprefix $(BUILD)/,$(FROZEN_MPY_PY_FILES:.py=.mpy)) CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool CFLAGS += -DMICROPY_MODULE_FROZEN_MPY diff --git a/unix/Makefile b/unix/Makefile index cb9a999f08..3afa80dfa8 100644 --- a/unix/Makefile +++ b/unix/Makefile @@ -183,7 +183,7 @@ ifneq ($(FROZEN_MPY_DIR),) # then invoke make with FROZEN_MPY_DIR=frozen (be sure to build from scratch). MPY_CROSS = ../mpy-cross/mpy-cross MPY_TOOL = ../tools/mpy-tool.py -FROZEN_MPY_PY_FILES := $(shell find $(FROZEN_MPY_DIR)/ -type f -name '*.py') +FROZEN_MPY_PY_FILES := $(shell find $(FROZEN_MPY_DIR) -type f -name '*.py') FROZEN_MPY_MPY_FILES := $(addprefix $(BUILD)/,$(FROZEN_MPY_PY_FILES:.py=.mpy)) CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool CFLAGS += -DMICROPY_MODULE_FROZEN_MPY |