From: Alexandru Ardelean Date: Mon, 9 Jan 2017 12:46:18 +0000 (+0200) Subject: tools/qemu: use default host configure rule ; set appropriate vars & args X-Git-Tag: v18.06.0-rc1~4073 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2b84dfafa44df86981ac909934e2ff4cfe7a02ea;p=openwrt%2Fopenwrt.git tools/qemu: use default host configure rule ; set appropriate vars & args Admittedly, this is my own OCD wanting to get rid of this. Because I tried (a while back to upgrade QEMU to a newer version), and (during that attempt) I tried to get rid of this. Tested on Linux & Mac. Signed-off-by: Alexandru Ardelean --- diff --git a/tools/qemu/Makefile b/tools/qemu/Makefile index 2d954e47aa..783d0f9fad 100644 --- a/tools/qemu/Makefile +++ b/tools/qemu/Makefile @@ -18,15 +18,13 @@ include $(INCLUDE_DIR)/host-build.mk HOST_CFLAGS += -I$(STAGING_DIR_HOST)/include/e2fsprogs -define Host/Configure - (cd $(HOST_BUILD_DIR); \ - CFLAGS="$(HOST_CFLAGS)" \ - LDFLAGS="$(HOST_LDFLAGS)" \ - $(HOST_CONFIGURE_CMD) \ - --extra-cflags="$(HOST_CFLAGS)" \ - --enable-uuid \ - ) -endef +HOST_CONFIGURE_VARS := \ + CFLAGS="$(HOST_CFLAGS)" \ + LDFLAGS="$(HOST_LDFLAGS)" + +HOST_CONFIGURE_ARGS := \ + --extra-cflags="$(HOST_CFLAGS)" \ + --enable-uuid define Host/Compile $(MAKE) -C $(HOST_BUILD_DIR) qemu-img