Skip to content

Commit 9c04ef2

Browse files
dpgeorgedpgeorge
committed
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 adafruit#2374.
1 parent 1f61fe0 commit 9c04ef2

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

‎esp8266/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ DRIVERS_SRC_C = $(addprefix drivers/,\
141141
SRC_S = \
142142
gchelper.s \
143143

144-
FROZEN_MPY_PY_FILES := $(shell find $(FROZEN_MPY_DIR)/ -type f -name '*.py')
144+
FROZEN_MPY_PY_FILES := $(shell find $(FROZEN_MPY_DIR) -type f -name '*.py')
145145
FROZEN_MPY_MPY_FILES := $(addprefix $(BUILD)/,$(FROZEN_MPY_PY_FILES:.py=.mpy))
146146

147147
OBJ =

‎stmhal/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ endif
284284
ifneq ($(FROZEN_MPY_DIR),)
285285
# To use frozen bytecode, put your .py files in a subdirectory (eg frozen/) and
286286
# then invoke make with FROZEN_MPY_DIR=frozen (be sure to build from scratch).
287-
FROZEN_MPY_PY_FILES := $(shell find $(FROZEN_MPY_DIR)/ -type f -name '*.py')
287+
FROZEN_MPY_PY_FILES := $(shell find $(FROZEN_MPY_DIR) -type f -name '*.py')
288288
FROZEN_MPY_MPY_FILES := $(addprefix $(BUILD)/,$(FROZEN_MPY_PY_FILES:.py=.mpy))
289289
CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
290290
CFLAGS += -DMICROPY_MODULE_FROZEN_MPY

‎unix/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ ifneq ($(FROZEN_MPY_DIR),)
183183
# then invoke make with FROZEN_MPY_DIR=frozen (be sure to build from scratch).
184184
MPY_CROSS = ../mpy-cross/mpy-cross
185185
MPY_TOOL = ../tools/mpy-tool.py
186-
FROZEN_MPY_PY_FILES := $(shell find $(FROZEN_MPY_DIR)/ -type f -name '*.py')
186+
FROZEN_MPY_PY_FILES := $(shell find $(FROZEN_MPY_DIR) -type f -name '*.py')
187187
FROZEN_MPY_MPY_FILES := $(addprefix $(BUILD)/,$(FROZEN_MPY_PY_FILES:.py=.mpy))
188188
CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
189189
CFLAGS += -DMICROPY_MODULE_FROZEN_MPY

0 commit comments

Comments
 (0)