| fiptool: respect OPENSSL_DIR |
| |
| fiptool links to libcrypto, so as with the other tools it should respect |
| OPENSSL_DIR for include/library paths. |
| |
| Upstream-Status: Submitted |
| Signed-off-by: Ross Burton <ross.burton@arm.com> |
| |
| diff --git a/Makefile b/Makefile |
| index ec6f88585..2d3b9fc26 100644 |
| --- a/Makefile |
| +++ b/Makefile |
| @@ -1388,7 +1388,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} |
| + ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" FIPTOOL=${FIPTOOL} OPENSSL_DIR=${OPENSSL_DIR} --no-print-directory -C ${FIPTOOLPATH} |
| 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 11d2e7b0b..7c2a08379 100644 |
| --- a/tools/fiptool/Makefile |
| +++ b/tools/fiptool/Makefile |
| @@ -12,6 +12,8 @@ FIPTOOL ?= fiptool${BIN_EXT} |
| PROJECT := $(notdir ${FIPTOOL}) |
| OBJECTS := fiptool.o tbbr_config.o |
| V ?= 0 |
| +OPENSSL_DIR := /usr |
| + |
| |
| override CPPFLAGS += -D_GNU_SOURCE -D_XOPEN_SOURCE=700 |
| HOSTCCFLAGS := -Wall -Werror -pedantic -std=c99 |
| @@ -20,7 +22,7 @@ ifeq (${DEBUG},1) |
| else |
| HOSTCCFLAGS += -O2 |
| endif |
| -LDLIBS := -lcrypto |
| +LDLIBS := -L${OPENSSL_DIR}/lib -lcrypto |
| |
| ifeq (${V},0) |
| Q := @ |
| @@ -28,7 +30,7 @@ else |
| Q := |
| endif |
| |
| -INCLUDE_PATHS := -I../../include/tools_share |
| +INCLUDE_PATHS := -I../../include/tools_share -I${OPENSSL_DIR}/include |
| |
| HOSTCC ?= gcc |
| |