From 968fa531977f5d5b8ef8da83553f66d4a638cb51 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Thu, 12 Jan 2017 15:31:13 +0200 Subject: tools/cmake: remove HOST_CONFIGURE_CMD and re-distribute the args & vars The final semantic is the same, but this is a bit more correct. Build tested on Windows 10 (yes, there is some Ubuntu mode for Windows 10, and I've been also building LEDE on it for a few weeks). Signed-off-by: Alexandru Ardelean --- tools/cmake/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'tools/cmake') diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile index f3712391a6..d6f03e4208 100644 --- a/tools/cmake/Makefile +++ b/tools/cmake/Makefile @@ -19,15 +19,12 @@ HOST_CONFIGURE_PARALLEL:=1 include $(INCLUDE_DIR)/host-build.mk -HOST_CONFIGURE_CMD := \ - MAKEFLAGS="$(HOST_JOBS)" \ - $(BASH) ./configure \ - $(if $(MAKE_JOBSERVER),--parallel="$(MAKE_JOBSERVER)") - HOST_CONFIGURE_VARS += \ + MAKEFLAGS="$(HOST_JOBS)" \ CXXFLAGS="$(HOST_CFLAGS)" HOST_CONFIGURE_ARGS := \ + $(if $(MAKE_JOBSERVER),--parallel="$(MAKE_JOBSERVER)") \ --prefix=$(STAGING_DIR_HOST) ifneq ($(findstring c,$(OPENWRT_VERBOSE)),) -- cgit v1.2.3