summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien George <damien@micropython.org>2022-07-18 22:44:45 +1000
committerDamien George <damien@micropython.org>2022-07-18 22:45:38 +1000
commitb87f796ef5c8cd7a02e04052913c67a47d057fc5 (patch)
treee65e44daa774f32687e747101faeca0e6764d9f2
parent13c78ab6fef333c913d54bafaf628c121fe1e58d (diff)
unix/Makefile: Only include axtls in GIT_SUBMODULES list when enabled.
Signed-off-by: Damien George <damien@micropython.org>
-rw-r--r--ports/unix/Makefile13
1 files changed, 5 insertions, 8 deletions
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index dc44744da..05b8d9bff 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -30,7 +30,7 @@ UNAME_S := $(shell uname -s)
include $(TOP)/py/py.mk
include $(TOP)/extmod/extmod.mk
-GIT_SUBMODULES += lib/axtls lib/berkeley-db-1.xx lib/libffi
+GIT_SUBMODULES += lib/berkeley-db-1.xx lib/libffi
INC += -I.
INC += -I$(TOP)
@@ -134,6 +134,9 @@ LDFLAGS_MOD += $(LIBPTHREAD)
endif
ifeq ($(MICROPY_PY_USSL),1)
+ifeq ($(MICROPY_SSL_AXTLS),1)
+GIT_SUBMODULES += lib/axtls
+endif
ifeq ($(MICROPY_SSL_MBEDTLS),1)
GIT_SUBMODULES += lib/mbedtls
CFLAGS_MOD += -DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"'
@@ -325,7 +328,7 @@ else
CROSS_COMPILE_HOST =
endif
-deplibs: libffi axtls
+deplibs: libffi
libffi: $(BUILD)/lib/libffi/include/ffi.h
@@ -339,12 +342,6 @@ $(BUILD)/lib/libffi/include/ffi.h: $(TOP)/lib/libffi/configure
$(abspath $(TOP))/lib/libffi/configure $(CROSS_COMPILE_HOST) --prefix=$$PWD/out --disable-structs CC="$(CC)" CXX="$(CXX)" LD="$(LD)" CFLAGS="-Os -fomit-frame-pointer -fstrict-aliasing -ffast-math -fno-exceptions"; \
$(MAKE) install-exec-recursive; $(MAKE) -C include install-data-am
-axtls: $(TOP)/lib/axtls/README
-
-$(TOP)/lib/axtls/README:
- @echo "You cloned without --recursive, fetching submodules for you."
- (cd $(TOP); git submodule update --init --recursive)
-
PREFIX = /usr/local
BINDIR = $(DESTDIR)$(PREFIX)/bin