aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Thiery <heiko.thiery@gmail.com>2022-08-06 13:22:53 +0200
committerHeinrich Schuchardt <heinrich.schuchardt@canonical.com>2022-08-20 08:38:12 +0200
commit2a4fb47533318f26702a8e8a38a002433e75202b (patch)
treeb4d95b594f50ed7e95066e92fdd5e436a98f3ba1
parentab31c8a158715abe4bceadb8eb78aa3e281d0bdc (diff)
downloadu-boot-2a4fb47533318f26702a8e8a38a002433e75202b.zip
u-boot-2a4fb47533318f26702a8e8a38a002433e75202b.tar.gz
u-boot-2a4fb47533318f26702a8e8a38a002433e75202b.tar.bz2
tools: mkeficapsule: use pkg-config for each lib separat
Call pkg-config for each library individually. This improves fallback handling. Suggested-by: AKASHI Takahiro <takahiro.akashi@linaro.org> Fixes: 31a7688cbe0e ("tools: mkeficapsule: use pkg-config to get -luuid and -lgnutls") Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com> Reviewed-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
-rw-r--r--tools/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/Makefile b/tools/Makefile
index 005e736..3626919 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -245,9 +245,13 @@ hostprogs-$(CONFIG_ASN1_COMPILER) += asn1_compiler
HOSTCFLAGS_asn1_compiler.o = -idirafter $(srctree)/include
HOSTCFLAGS_mkeficapsule.o += \
- $(shell pkg-config --cflags gnutls uuid 2> /dev/null || echo "")
+ $(shell pkg-config --cflags gnutls 2> /dev/null || echo "")
+HOSTCFLAGS_mkeficapsule.o += \
+ $(shell pkg-config --cflags uuid 2> /dev/null || echo "")
+HOSTLDLIBS_mkeficapsule += \
+ $(shell pkg-config --libs gnutls 2> /dev/null || echo "-lgnutls")
HOSTLDLIBS_mkeficapsule += \
- $(shell pkg-config --libs gnutls uuid 2> /dev/null || echo "-lgnutls -luuid")
+ $(shell pkg-config --libs uuid 2> /dev/null || echo "-luuid")
hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule
# We build some files with extra pedantic flags to try to minimize things