diff options
| -rw-r--r-- | ports/cc3200/application.mk | 3 | ||||
| -rw-r--r-- | ports/esp8266/Makefile | 2 | ||||
| -rw-r--r-- | ports/nrf/Makefile | 4 | ||||
| -rw-r--r-- | ports/pic16bit/Makefile | 3 | ||||
| -rw-r--r-- | ports/stm32/Makefile | 5 | ||||
| -rw-r--r-- | ports/unix/Makefile | 3 | ||||
| -rw-r--r-- | ports/windows/Makefile | 3 |
7 files changed, 2 insertions, 21 deletions
diff --git a/ports/cc3200/application.mk b/ports/cc3200/application.mk index 15a5824c3..7c6773ef4 100644 --- a/ports/cc3200/application.mk +++ b/ports/cc3200/application.mk @@ -165,9 +165,6 @@ OBJ += $(BUILD)/pins.o # List of sources for qstr extraction SRC_QSTR += $(APP_MODS_SRC_C) $(APP_MISC_SRC_C) $(APP_STM_SRC_C) $(APP_SHARED_SRC_C) $(APP_HAL_SRC_C) $(GEN_PINS_SRC) -# Append any auto-generated sources that are needed by sources listed in -# SRC_QSTR -SRC_QSTR_AUTO_DEPS += # Add the linker script LINKER_SCRIPT = application.lds diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile index b29df9fd2..cea0e789c 100644 --- a/ports/esp8266/Makefile +++ b/ports/esp8266/Makefile @@ -187,8 +187,6 @@ OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o)) # List of sources for qstr extraction SRC_QSTR += $(SRC_C) $(SHARED_SRC_C) -# Append any auto-generated sources that are needed by sources listed in SRC_QSTR -SRC_QSTR_AUTO_DEPS += all: $(FWBIN) diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile index cb81ad847..2f9b93d7f 100644 --- a/ports/nrf/Makefile +++ b/ports/nrf/Makefile @@ -528,10 +528,6 @@ $(BUILD)/$(OUTPUT_FILENAME).elf: $(OBJ) # List of sources for qstr extraction SRC_QSTR += $(SRC_C) $(SRC_SHARED_C) $(DRIVERS_SRC_C) $(SRC_BOARD_MODULES) $(GEN_PINS_SRC) -# Append any auto-generated sources that are needed by sources listed in -# SRC_QSTR -SRC_QSTR_AUTO_DEPS += - # Making OBJ use an order-only dependency on the generated pins.h file # has the side effect of making the pins.h file before we actually compile # any of the objects. The normal dependency generation will deal with the diff --git a/ports/pic16bit/Makefile b/ports/pic16bit/Makefile index d2c8df470..6d061514f 100644 --- a/ports/pic16bit/Makefile +++ b/ports/pic16bit/Makefile @@ -51,9 +51,6 @@ OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o) $(SRC_S:.s=.o)) # List of sources for qstr extraction SRC_QSTR += $(SRC_C) -# Append any auto-generated sources that are needed by sources listed in -# SRC_QSTR -SRC_QSTR_AUTO_DEPS += all: $(BUILD)/firmware.hex diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile index 5b853592c..8d521182f 100644 --- a/ports/stm32/Makefile +++ b/ports/stm32/Makefile @@ -652,9 +652,6 @@ $(BUILD)/firmware.elf: $(OBJ) # List of sources for qstr extraction SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SHARED_SRC_C) $(GEN_PINS_SRC) -# Append any auto-generated sources that are needed by sources listed in -# SRC_QSTR -SRC_QSTR_AUTO_DEPS += $(GEN_CDCINF_HEADER) # Making OBJ use an order-only dependency on the generated pins.h file # has the side effect of making the pins.h file before we actually compile @@ -668,6 +665,8 @@ $(OBJ): | $(GEN_PINS_HDR) $(HEADER_BUILD)/qstrdefs.generated.h: $(BOARD_DIR)/mpconfigboard.h # main.c can't be even preprocessed without $(GEN_CDCINF_HEADER) +# As main.c is in SRC_QSTR this will also ensure that GEN_CDCINF_HEADER +# will be run before QSTR extraction. main.c: $(GEN_CDCINF_HEADER) # Use a pattern rule here so that make will only call make-pins.py once to make diff --git a/ports/unix/Makefile b/ports/unix/Makefile index 52ae8314e..9f5e01a5f 100644 --- a/ports/unix/Makefile +++ b/ports/unix/Makefile @@ -229,9 +229,6 @@ OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o)) # List of sources for qstr extraction SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SHARED_SRC_C) -# Append any auto-generated sources that are needed by sources listed in -# SRC_QSTR -SRC_QSTR_AUTO_DEPS += ifneq ($(FROZEN_MANIFEST),) CFLAGS += -DMPZ_DIG_SIZE=16 # force 16 bits to work on both 32 and 64 bit archs diff --git a/ports/windows/Makefile b/ports/windows/Makefile index 31ac8d8b8..47ce664d7 100644 --- a/ports/windows/Makefile +++ b/ports/windows/Makefile @@ -82,9 +82,6 @@ LIB += -lws2_32 # List of sources for qstr extraction SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SHARED_SRC_C) -# Append any auto-generated sources that are needed by sources listed in -# SRC_QSTR -SRC_QSTR_AUTO_DEPS += ifneq ($(FROZEN_MANIFEST),) CFLAGS += -DMPZ_DIG_SIZE=16 |