Skip to content

Commit 3699cc7

Browse files
committed
Merge branch 'main' of github.com:ladyada/circuitpython into main
2 parents a9713b7 + b5ab73b commit 3699cc7

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

mpy-cross/mpy-cross.mk

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@ include ../py/mkenv.mk
66

77
# define main target
88

9-
ifeq ($(OS),Windows_NT)
10-
# Detect a MINGW32 build, and change the name of the final executable.
119
PROG ?= mpy-cross
12-
else
13-
PROG ?= mpy-cross
14-
endif
1510

1611
# qstr definitions (must come before including py.mk)
1712
QSTR_DEFS = qstrdefsport.h

ports/espressif/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ $(BUILD)/lib/protomatter/src/core.o: CFLAGS += -DESP32
310310
SRC_QSTR += $(SRC_C) $(SRC_SUPERVISOR) $(SRC_MOD) $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED)
311311

312312
# IDF build commands
313-
IDF_PATH = "$(realpath ./esp-idf)"
313+
IDF_PATH = $(realpath ./esp-idf)
314314
# create the directory
315315
$(BUILD)/esp-idf:
316316
$(Q)$(MKDIR) -p $@

0 commit comments

Comments
 (0)