From f033e4e6824dea386a44098720e3f700e4d5db1b Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 25 Oct 2021 12:27:59 +0100 Subject: [PATCH 2/3] fix(fiptool): respect OPENSSL_DIR fiptool links to libcrypto, so as with the other tools it should respect OPENSSL_DIR for include/library paths. Change-Id: Icd8c15fa5097db1da9a3a9222d9e267548c4c7e2 Signed-off-by: Ross Burton Upstream-Status: Backport [https://github.com/ARM-software/arm-trusted-firmware/commit/dd14d0f63f7d049cbcbfd3f8128f05e9a351bbe5] Signed-off-by: Jose Quaresma --- Makefile | 2 +- tools/fiptool/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 77b9dd76cc..f3b2098026 100644 --- a/Makefile +++ b/Makefile @@ -1438,7 +1438,7 @@ fwu_fip: ${BUILD_PLAT}/${FWU_FIP_NAME} ${FIPTOOL}: FORCE ifdef UNIX_MK - ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" FIPTOOL=${FIPTOOL} --no-print-directory -C ${FIPTOOLPATH} all + ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" FIPTOOL=${FIPTOOL} OPENSSL_DIR=${OPENSSL_DIR} --no-print-directory -C ${FIPTOOLPATH} all else # Clear the MAKEFLAGS as we do not want # to pass the gnumake flags to nmake. diff --git a/tools/fiptool/Makefile b/tools/fiptool/Makefile index 7fc5670eec..4c549748ad 100644 --- a/tools/fiptool/Makefile +++ b/tools/fiptool/Makefile @@ -30,7 +30,7 @@ else Q := endif -INCLUDE_PATHS := -I../../include/tools_share +INCLUDE_PATHS := -I../../include/tools_share -I${OPENSSL_DIR}/include HOSTCC ?= gcc -- 2.17.1