Skip to content

Commit 1eb35f3

Browse files
committed
Revert "Show guidance if the framework is not found"
This reverts commit f9bbe0d. See the following revert commit for an explanation. Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no> (cherry picked from commit d03fc39) Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
1 parent c786fda commit 1eb35f3

File tree

3 files changed

+1
-26
lines changed

3 files changed

+1
-26
lines changed

CMakeLists.txt

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

303-
if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/framework/CMakeLists.txt")
304-
message(FATAL_ERROR "${CMAKE_CURRENT_SOURCE_DIR}/framework/CMakeLists.txt not found. Run `git submodule update --init` from the source tree to fetch the submodule contents.")
305-
endif()
306303
add_subdirectory(framework)
307304

308305
add_subdirectory(include)

library/Makefile

+1-13
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,7 @@ GENERATED_FILES := \
88
psa_crypto_driver_wrappers.h \
99
psa_crypto_driver_wrappers_no_static.c
1010

11-
ifneq ($(GENERATED_FILES),$(wildcard $(GENERATED_FILES)))
12-
ifeq (,$(wildcard $(MBEDTLS_PATH)/framework/exported.make))
13-
# Use the define keyword to get a multi-line message.
14-
# GNU make appends ". Stop.", so tweak the ending of our message accordingly.
15-
define error_message
16-
$(MBEDTLS_PATH)/framework/exported.make not found.
17-
Run `git submodule update --init` to fetch the submodule contents.
18-
This is a fatal error
19-
endef
20-
$(error $(error_message))
21-
endif
22-
include $(MBEDTLS_PATH)/framework/exported.make
23-
endif
11+
include $(MBEDTLS_PATH)/framework/exported.make
2412

2513
# Also see "include/mbedtls/mbedtls_config.h"
2614

scripts/common.make

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

7-
ifeq (,$(wildcard $(MBEDTLS_PATH)/framework/exported.make))
8-
# Use the define keyword to get a multi-line message.
9-
# GNU make appends ". Stop.", so tweak the ending of our message accordingly.
10-
define error_message
11-
$(MBEDTLS_PATH)/framework/exported.make not found.
12-
Run `git submodule update --init` to fetch the submodule contents.
13-
This is a fatal error
14-
endef
15-
$(error $(error_message))
16-
endif
177
include $(MBEDTLS_PATH)/framework/exported.make
188

199
CFLAGS ?= -O2

0 commit comments

Comments
 (0)