Skip to content

Commit b87f796

Browse files
committed
unix/Makefile: Only include axtls in GIT_SUBMODULES list when enabled.
Signed-off-by: Damien George <damien@micropython.org>
1 parent 13c78ab commit b87f796

1 file changed

Lines changed: 5 additions & 8 deletions

File tree

ports/unix/Makefile

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ UNAME_S := $(shell uname -s)
3030
include $(TOP)/py/py.mk
3131
include $(TOP)/extmod/extmod.mk
3232

33-
GIT_SUBMODULES += lib/axtls lib/berkeley-db-1.xx lib/libffi
33+
GIT_SUBMODULES += lib/berkeley-db-1.xx lib/libffi
3434

3535
INC += -I.
3636
INC += -I$(TOP)
@@ -134,6 +134,9 @@ LDFLAGS_MOD += $(LIBPTHREAD)
134134
endif
135135

136136
ifeq ($(MICROPY_PY_USSL),1)
137+
ifeq ($(MICROPY_SSL_AXTLS),1)
138+
GIT_SUBMODULES += lib/axtls
139+
endif
137140
ifeq ($(MICROPY_SSL_MBEDTLS),1)
138141
GIT_SUBMODULES += lib/mbedtls
139142
CFLAGS_MOD += -DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"'
@@ -325,7 +328,7 @@ else
325328
CROSS_COMPILE_HOST =
326329
endif
327330

328-
deplibs: libffi axtls
331+
deplibs: libffi
329332

330333
libffi: $(BUILD)/lib/libffi/include/ffi.h
331334

@@ -339,12 +342,6 @@ $(BUILD)/lib/libffi/include/ffi.h: $(TOP)/lib/libffi/configure
339342
$(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"; \
340343
$(MAKE) install-exec-recursive; $(MAKE) -C include install-data-am
341344

342-
axtls: $(TOP)/lib/axtls/README
343-
344-
$(TOP)/lib/axtls/README:
345-
@echo "You cloned without --recursive, fetching submodules for you."
346-
(cd $(TOP); git submodule update --init --recursive)
347-
348345
PREFIX = /usr/local
349346
BINDIR = $(DESTDIR)$(PREFIX)/bin
350347

0 commit comments

Comments
 (0)