summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--esp8266/Makefile7
-rw-r--r--py/py.mk2
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 $@
diff --git a/py/py.mk b/py/py.mk
index 1a3bfb9421..6781504293 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -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