diff options
| author | Reza Arbab <arbab@linux.ibm.com> | 2025-05-09 12:53:11 -0500 |
|---|---|---|
| committer | Reza Arbab <arbab@linux.ibm.com> | 2025-05-16 13:08:36 -0500 |
| commit | 9abbfe67df5b59b3fd37f8bed688df40e5c7a476 (patch) | |
| tree | 9ed1b56c6a44ef7f582bd0c30001a7226fbd649c | |
| parent | d23546f86b2b8c32e5cb60a04174e88eb0ea7d10 (diff) | |
| download | skiboot-9abbfe67df5b59b3fd37f8bed688df40e5c7a476.zip skiboot-9abbfe67df5b59b3fd37f8bed688df40e5c7a476.tar.gz skiboot-9abbfe67df5b59b3fd37f8bed688df40e5c7a476.tar.bz2 | |
libstb/(create|print)-container: Enable custom ssl dir
Respect SSL_DIR if it is set, to use ssl headers and libs that are in a
nonstandard location.
When skiboot is built by op-build, the system ssl installation is being
used instead of the buildroot one. This change will let us fix that.
Signed-off-by: Reza Arbab <arbab@linux.ibm.com>
| -rw-r--r-- | libstb/Makefile.inc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libstb/Makefile.inc b/libstb/Makefile.inc index d3a9ee2..8c4536f 100644 --- a/libstb/Makefile.inc +++ b/libstb/Makefile.inc @@ -19,15 +19,20 @@ CPPFLAGS += -I$(SRC)/$(LIBSTB_DIR)/crypto/mbedtls/include CPPFLAGS += -I$(SRC)/$(LIBSTB_DIR)/ibmtpm20tss/utils CFLAGS += -DTPM_SKIBOOT +ifneq ($(SSL_DIR),) +HOSTCFLAGS += -I$(SSL_DIR)/include +HOSTLDFLAGS += -L$(SSL_DIR)/lib -Wl,-rpath,$(SSL_DIR)/lib +endif + $(LIBSTB): $(LIBSTB_OBJS:%=$(LIBSTB_DIR)/%) $(DRIVERS) $(SECVAR) $(CRYPTO) $(TSS2) libstb/create-container: libstb/create-container.c libstb/container-utils.c - $(call Q, HOSTCC ,$(HOSTCC) $(HOSTCFLAGS) \ + $(call Q, HOSTCC ,$(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) \ -Wpadded -O0 -g -I$(SRC) -I$(SRC)/include -o $@ $^ -lssl -lcrypto,$<) libstb/print-container: HOSTCFLAGS += -Wno-error=deprecated-declarations libstb/print-container: libstb/print-container.c libstb/container-utils.c - $(call Q, HOSTCC , $(HOSTCC) $(HOSTCFLAGS) \ + $(call Q, HOSTCC , $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) \ -O0 -g -I$(SRC) -I$(SRC)/include -o $@ $^ -lssl -lcrypto, $<) clean: container-utils-clean |