diff options
| author | Tom Hughes <tomhughes@chromium.org> | 2022-09-23 09:01:45 -0700 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-09-27 16:09:03 +0000 |
| commit | 819c9323930cfd9b5e626a7ec94fbb0ea02273c7 (patch) | |
| tree | 7ab133e6d15eb67376f668c569b9bf9ef9217732 /Makefile.toolchain | |
| parent | 0638283de5c4337cebb65533a72a93a112180319 (diff) | |
| download | chrome-ec-819c9323930cfd9b5e626a7ec94fbb0ea02273c7.tar.gz | |
Makefile.toolchain: Use correct pkg-config with libftdi
The EC makefile distinguishes between building for the build machine
(BUILD) and building for the platform that the EC is running on top of
(e.g., the Chromebook's AP). PKG_CONFIG was missing this distinction,
which causes the ebuild to fail when cross-compiling for ARM chromebooks
(BUILD=x86_64, HOST=arm64).
BRANCH=none
BUG=b:246424843
TEST=CQ passes
Cq-Depend: chromium:3916417
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Change-Id: Idc107267b52f55129269851b114b09649b9b3778
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3914139
Reviewed-by: Edward Hill <ecgh@chromium.org>
Diffstat (limited to 'Makefile.toolchain')
| -rw-r--r-- | Makefile.toolchain | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Makefile.toolchain b/Makefile.toolchain index 0a82922a3e..b960fadb4f 100644 --- a/Makefile.toolchain +++ b/Makefile.toolchain @@ -72,6 +72,7 @@ OBJCOPY=$(CROSS_COMPILE)objcopy OBJDUMP=$(CROSS_COMPILE)objdump ADDR2LINE=$(CROSS_COMPILE)addr2line PKG_CONFIG?=pkg-config +BUILD_PKG_CONFIG?=$(PKG_CONFIG) BUILDCC?=$(CCACHE) $(BUILDCC_PREFIX)$(cc-name) HOSTCC?=$(CCACHE) $(HOST_CROSS_COMPILE)$(cc-name) HOSTCXX?=$(CCACHE) $(HOST_CROSS_COMPILE)clang++ @@ -183,8 +184,11 @@ else endif endif -LIBFTDIUSB_CFLAGS:=$(shell $(PKG_CONFIG) --cflags lib${LIBFTDI_NAME} libusb-1.0) -LIBFTDIUSB_LDLIBS:=$(shell $(PKG_CONFIG) --libs lib${LIBFTDI_NAME} libusb-1.0) +LIBFTDIUSB_HOST_CFLAGS:=$(shell $(HOST_PKG_CONFIG) --cflags lib${LIBFTDI_NAME} libusb-1.0) +LIBFTDIUSB_HOST_LDLIBS:=$(shell $(HOST_PKG_CONFIG) --libs lib${LIBFTDI_NAME} libusb-1.0) + +LIBFTDIUSB_BUILD_CFLAGS:=$(shell $(BUILD_PKG_CONFIG) --cflags lib${LIBFTDI_NAME} libusb-1.0) +LIBFTDIUSB_BUILD_LDLIBS:=$(shell $(BUILD_PKG_CONFIG) --libs lib${LIBFTDI_NAME} libusb-1.0) ifeq ($(TEST_FUZZ),y) LIBPROTOBUF_CFLAGS:=$(shell $(PKG_CONFIG) --cflags protobuf) @@ -196,12 +200,12 @@ LIBPROTOBUF_MUTATOR_LDLIBS:=$(shell $(PKG_CONFIG) --libs libprotobuf-mutator) \ ${LIBPROTOBUF_LDLIBS} endif -BUILD_CFLAGS=$(LIBFTDIUSB_CFLAGS) $(BUILD_CPPFLAGS) -O3 $(CFLAGS_DEBUG) +BUILD_CFLAGS=$(LIBFTDIUSB_BUILD_CFLAGS) $(BUILD_CPPFLAGS) -O3 $(CFLAGS_DEBUG) BUILD_CFLAGS+=$(CFLAGS_WARN) BUILD_CFLAGS+=-DCHROMIUM_EC=$(EMPTY) HOST_CFLAGS=$(HOST_CPPFLAGS) -O3 $(CFLAGS_DEBUG) $(CFLAGS_WARN) \ -DHOST_TOOLS_BUILD=$(EMPTY) -HOST_CFLAGS+=$(LIBFTDIUSB_CFLAGS) +HOST_CFLAGS+=$(LIBFTDIUSB_HOST_CFLAGS) HOST_CFLAGS+=-DCHROMIUM_EC=$(EMPTY) HOST_CXXFLAGS=$(HOST_CFLAGS) -Wno-c99-designator ifneq (${SYSROOT},) @@ -218,8 +222,8 @@ MEMSIZE_FLAGS= ifeq ($(cc-name),gcc) MEMSIZE_FLAGS+=-Wl,--print-memory-usage endif -BUILD_LDFLAGS=$(LIBFTDIUSB_LDLIBS) -HOST_LDFLAGS=$(LIBFTDIUSB_LDLIBS) +BUILD_LDFLAGS=$(LIBFTDIUSB_BUILD_LDLIBS) +HOST_LDFLAGS=$(LIBFTDIUSB_HOST_LDLIBS) ifneq (${HOST_SYSROOT},) HOST_LDFLAGS+=--sysroot=${HOST_SYSROOT} endif |