summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorMattias Nissler <mnissler@chromium.org>2020-11-23 13:11:35 +0000
committerCommit Bot <commit-bot@chromium.org>2020-11-26 01:09:25 +0000
commit7fa6cb47c9441418d7e482b00cac5456e2edb8ed (patch)
treeb2b41e0e1d37720b1788e0e06d0be27f9fe2d293 /util
parent559ad51bad0a4204e8735c6a9e0ec7256a8ea0b2 (diff)
downloadchrome-ec-7fa6cb47c9441418d7e482b00cac5456e2edb8ed.tar.gz
Use host's pkg-config for gen_touchpad_hash
This is a helper running on the host, so should use host tooling. Changing this avoids a build failure on cheza where chromeos-ec the would fail to build before the openssl package (which is supposed to work given that chromeos-ec doesn't list openssl in its dependencies, and this pkg-config invocation is not a reason to start doing so). BUG=None BRANCH=None TEST=emerge-cheza -v1 chromeos-ec Signed-off-by: Mattias Nissler <mnissler@chromium.org> Change-Id: I45161285db17a56b29a36549d3b113f42dff9362 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2550660 Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
Diffstat (limited to 'util')
-rw-r--r--util/build.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/util/build.mk b/util/build.mk
index 82b9ec7d66..62306099a5 100644
--- a/util/build.mk
+++ b/util/build.mk
@@ -90,11 +90,11 @@ build-util-bin += gen_touchpad_hash
# Assume RW section (touchpad FW must be identical for both RO+RW)
$(out)/util/gen_touchpad_hash: BUILD_LDFLAGS += -DSECTION_IS_RW=$(EMPTY)
-OPENSSL_CFLAGS := $(shell $(PKG_CONFIG) --libs openssl)
-OPENSSL_LDFLAGS := $(shell $(PKG_CONFIG) --libs openssl)
+HOST_OPENSSL_CFLAGS := $(shell $(HOST_PKG_CONFIG) --cflags openssl)
+HOST_OPENSSL_LDFLAGS := $(shell $(HOST_PKG_CONFIG) --libs openssl)
-$(out)/util/gen_touchpad_hash: BUILD_CFLAGS += $(OPENSSL_CFLAGS)
-$(out)/util/gen_touchpad_hash: BUILD_LDFLAGS += $(OPENSSL_LDFLAGS)
+$(out)/util/gen_touchpad_hash: BUILD_CFLAGS += $(HOST_OPENSSL_CFLAGS)
+$(out)/util/gen_touchpad_hash: BUILD_LDFLAGS += $(HOST_OPENSSL_LDFLAGS)
deps-y += $(out)/util/gen_touchpad_hash.d
endif # CONFIG_TOUCHPAD_VIRTUAL_OFF