Skip to content

Commit 3eb9b8e

Browse files
committed
Revert "Require framework directory to exist when building"
This reverts commit 469f781. Remove the dependency on the framework directory. It was introduced in MbedTLS 3.6.0 and for now doesn't do much more than make CMake fail if `git submodule update --init` is not run. This needs to be revisited once bigger changes are made (with Mbed TLS 4.0) and the whole repository structure changes. Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no> (cherry picked from commit 6d8b909) Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
1 parent 1eb35f3 commit 3eb9b8e

File tree

4 files changed

+0
-24
lines changed

4 files changed

+0
-24
lines changed

CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,6 @@ if(LIB_INSTALL_DIR)
300300
set(CMAKE_INSTALL_LIBDIR "${LIB_INSTALL_DIR}")
301301
endif()
302302

303-
add_subdirectory(framework)
304-
305303
add_subdirectory(include)
306304

307305
add_subdirectory(3rdparty)

Makefile

-14
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,6 @@ DESTDIR=/usr/local
22
PREFIX=mbedtls_
33
PERL ?= perl
44

5-
ifneq (,$(filter-out lib library/%,$(or $(MAKECMDGOALS),all)))
6-
ifeq (,$(wildcard framework/exported.make))
7-
# Use the define keyword to get a multi-line message.
8-
# GNU make appends ". Stop.", so tweak the ending of our message accordingly.
9-
define error_message
10-
$(MBEDTLS_PATH)/framework/exported.make not found.
11-
Run `git submodule update --init` to fetch the submodule contents.
12-
This is a fatal error
13-
endef
14-
$(error $(error_message))
15-
endif
16-
include framework/exported.make
17-
endif
18-
195
.SILENT:
206

217
.PHONY: all no_test programs lib tests install uninstall clean test check lcov apidoc apidoc_clean

library/Makefile

-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
1-
ifndef MBEDTLS_PATH
2-
MBEDTLS_PATH := ..
3-
endif
4-
51
GENERATED_FILES := \
62
error.c version_features.c \
73
ssl_debug_helpers_generated.c \
84
psa_crypto_driver_wrappers.h \
95
psa_crypto_driver_wrappers_no_static.c
106

11-
include $(MBEDTLS_PATH)/framework/exported.make
12-
137
# Also see "include/mbedtls/mbedtls_config.h"
148

159
CFLAGS ?= -O2

scripts/common.make

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ ifndef MBEDTLS_PATH
44
MBEDTLS_PATH := ..
55
endif
66

7-
include $(MBEDTLS_PATH)/framework/exported.make
8-
97
CFLAGS ?= -O2
108
WARNING_CFLAGS ?= -Wall -Wextra -Wformat=2 -Wno-format-nonliteral
119
WARNING_CXXFLAGS ?= -Wall -Wextra -Wformat=2 -Wno-format-nonliteral -std=c++11 -pedantic

0 commit comments

Comments
 (0)