diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2016-07-16 04:53:33 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2016-07-16 04:56:23 +0300 |
| commit | 6aa7c805cc2812dafb396afcd909bbc99505c99b (patch) | |
| tree | 24423727f478829c9bbfd443f1bede5d4deaf9b3 | |
| parent | bcd0e9a7fa9ca9fa86a5c9ffc1855b74f5cbc6c7 (diff) | |
| download | micropython-6aa7c805cc2812dafb396afcd909bbc99505c99b.tar.gz micropython-6aa7c805cc2812dafb396afcd909bbc99505c99b.zip | |
esp8266: Cache Xtensa-built libaxtls.a in local build dir.
Allows to build the library variant for other archs in parallel.
| -rw-r--r-- | esp8266/Makefile | 7 | ||||
| -rw-r--r-- | py/py.mk | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/esp8266/Makefile b/esp8266/Makefile index 6ad7117f13..35a609b3d2 100644 --- a/esp8266/Makefile +++ b/esp8266/Makefile @@ -154,7 +154,7 @@ SRC_QSTR += $(SRC_C) $(STM_SRC_C) $(EXTMOD_SRC_C) $(DRIVERS_SRC_C) # Append any auto-generated sources that are needed by sources listed in SRC_QSTR SRC_QSTR_AUTO_DEPS += -all: $(BUILD)/firmware-combined.bin +all: $(BUILD)/libaxtls.a $(BUILD)/firmware-combined.bin CONFVARS_FILE = $(BUILD)/confvars @@ -230,8 +230,11 @@ $(BUILD)/firmware.elf: $(OBJ) include ../py/mkrules.mk -axtls: +axtls: $(BUILD)/libaxtls.a + +$(BUILD)/libaxtls.a: cd ../lib/axtls; cp config/upyconfig config/.config cd ../lib/axtls; make oldconfig -B cd ../lib/axtls; make clean cd ../lib/axtls; make all CC="$(CC)" LD="$(LD)" AR="$(AR)" CFLAGS_EXTRA="$(CFLAGS_XTENSA) -Dabort=abort_ -DRT_MAX_PLAIN_LENGTH=1024 -DRT_EXTRA=3072" + cp ../lib/axtls/_stage/libaxtls.a $@ @@ -23,7 +23,7 @@ ifeq ($(MICROPY_PY_USSL),1) CFLAGS_MOD += -DMICROPY_PY_USSL=1 ifeq ($(MICROPY_SSL_AXTLS),1) CFLAGS_MOD += -DMICROPY_SSL_AXTLS=1 -I../lib/axtls/ssl -I../lib/axtls/crypto -I../lib/axtls/config -LDFLAGS_MOD += -L../lib/axtls/_stage -laxtls +LDFLAGS_MOD += -Lbuild -laxtls endif endif |