Skip to content

Commit 5bf58c8

Browse files
Release: Set PKG_CONFIG_PATH as argument to ./configure
In OpenOCD both configure and configure.ac come from Git, hence may have same timestamp and as a result, makefile might try to regenerate configure. This might fail when cross building for Windows, because PKG_CONFIG_PATH shall be set properly to specify path to libusb-1.0 built for Windows hosts. But in this second run it is not set, hence reconfiguration fails. The solution is that this variable should be set not as an envvar to ./configure, but as an argument to it, thus it would be logged and set properly on the reconfigure runs. Hence, this: PKG_CONFIG_PATH=... ./configure is replaced with this: ./configure PKG_CONFIG_PATH=... Signed-off-by: Anton Kolesov <[email protected]>
1 parent 6a753dc commit 5bf58c8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

release.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -767,10 +767,10 @@ $(OOCD_BUILD_DIR_LINUX)/Makefile: | $(OOCD_BUILD_DIR_LINUX)
767767

768768
$(OOCD_BUILD_DIR_LINUX)/Makefile:
769769
cd $(OOCD_BUILD_DIR_LINUX) && \
770-
PKG_CONFIG_PATH=$(abspath $(BUILD_DIR)/libusb_linux_install)/lib/pkgconfig \
771770
$(OOCD_SRC_DIR)/configure \
772771
--enable-ftdi --disable-werror \
773772
--disable-libusb0 \
773+
PKG_CONFIG_PATH=$(abspath $(BUILD_DIR)/libusb_linux_install)/lib/pkgconfig \
774774
PKG_CONFIG=pkg-config \
775775
--prefix=$(abspath $O/$(OOCD_DIR_LINUX))
776776

0 commit comments

Comments
 (0)