From 3c70aa8845707cca98112d70f36c18f42ced8ceb Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Sat, 9 Apr 2022 08:49:26 -0500 Subject: [PATCH 1/2] Revert "fix paths with ('s or spaces" This reverts commit f7b3247deb4196f809f3d8f9a7cdaf214074bb0f. --- ports/espressif/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile index 214b9251e7..96360d06bd 100644 --- a/ports/espressif/Makefile +++ b/ports/espressif/Makefile @@ -310,7 +310,7 @@ $(BUILD)/lib/protomatter/src/core.o: CFLAGS += -DESP32 SRC_QSTR += $(SRC_C) $(SRC_SUPERVISOR) $(SRC_MOD) $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED) # IDF build commands -IDF_PATH = "$(realpath ./esp-idf)" +IDF_PATH = $(realpath ./esp-idf) # create the directory $(BUILD)/esp-idf: $(Q)$(MKDIR) -p $@ From b5ab73b111ab790c7c7382317a881c0c9cbb1bd7 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Sat, 9 Apr 2022 09:55:10 -0500 Subject: [PATCH 2/2] whole conditional block no longer needed --- mpy-cross/mpy-cross.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/mpy-cross/mpy-cross.mk b/mpy-cross/mpy-cross.mk index a975f8253b..825566efec 100644 --- a/mpy-cross/mpy-cross.mk +++ b/mpy-cross/mpy-cross.mk @@ -6,12 +6,7 @@ include ../py/mkenv.mk # define main target -ifeq ($(OS),Windows_NT) -# Detect a MINGW32 build, and change the name of the final executable. PROG ?= mpy-cross -else -PROG ?= mpy-cross -endif # qstr definitions (must come before including py.mk) QSTR_DEFS = qstrdefsport.h