diff options
| author | Alex Bennée | 2019-09-19 15:07:36 +0200 |
|---|---|---|
| committer | Alex Bennée | 2019-09-26 20:00:53 +0200 |
| commit | daa79d9a65c95dc4262f86523384d5a4d85d9742 (patch) | |
| tree | 7d5396ca35a79b6f55b2abb59e3fc0a8c3ec6463 | |
| parent | tests/tcg: add simple record/replay smoke test for aarch64 (diff) | |
| download | qemu-daa79d9a65c95dc4262f86523384d5a4d85d9742.tar.gz qemu-daa79d9a65c95dc4262f86523384d5a4d85d9742.tar.xz qemu-daa79d9a65c95dc4262f86523384d5a4d85d9742.zip | |
configure: preserve PKG_CONFIG for subdir builds
The slirp sub-module complains about not being able to find the glib
library on cross-compiles because it is using the default pkg-config
tool (which isn't installed in our cross-build docker images).
Preserve PKG_CONFIG in our host config and pass it down to slirp.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
| -rw-r--r-- | Makefile | 6 | ||||
| -rwxr-xr-x | configure | 1 |
2 files changed, 6 insertions, 1 deletions
@@ -510,7 +510,11 @@ capstone/all: .git-submodule-status .PHONY: slirp/all slirp/all: .git-submodule-status - $(call quiet-command,$(MAKE) -C $(SRC_PATH)/slirp BUILD_DIR="$(BUILD_DIR)/slirp" CC="$(CC)" AR="$(AR)" LD="$(LD)" RANLIB="$(RANLIB)" CFLAGS="$(QEMU_CFLAGS) $(CFLAGS)" LDFLAGS="$(LDFLAGS)") + $(call quiet-command,$(MAKE) -C $(SRC_PATH)/slirp \ + BUILD_DIR="$(BUILD_DIR)/slirp" \ + PKG_CONFIG="$(PKG_CONFIG)" \ + CC="$(CC)" AR="$(AR)" LD="$(LD)" RANLIB="$(RANLIB)" \ + CFLAGS="$(QEMU_CFLAGS) $(CFLAGS)" LDFLAGS="$(LDFLAGS)") # Compatibility gunk to keep make working across the rename of targets # for recursion, to be removed some time after 4.1. @@ -7302,6 +7302,7 @@ echo "OBJCOPY=$objcopy" >> $config_host_mak echo "LD=$ld" >> $config_host_mak echo "RANLIB=$ranlib" >> $config_host_mak echo "NM=$nm" >> $config_host_mak +echo "PKG_CONFIG=$pkg_config_exe" >> $config_host_mak echo "WINDRES=$windres" >> $config_host_mak echo "CFLAGS=$CFLAGS" >> $config_host_mak echo "CFLAGS_NOPIE=$CFLAGS_NOPIE" >> $config_host_mak |