[source] tools/cmake: remove HOST_CONFIGURE_CMD and re-distribute the args & vars

LEDE Commits lede-commits at lists.infradead.org
Mon Jan 16 11:40:30 PST 2017


nbd pushed a commit to source.git, branch master:
https://git.lede-project.org/968fa531977f5d5b8ef8da83553f66d4a638cb51

commit 968fa531977f5d5b8ef8da83553f66d4a638cb51
Author: Alexandru Ardelean <ardeleanalex at gmail.com>
AuthorDate: Thu Jan 12 15:31:13 2017 +0200

    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 <ardeleanalex at gmail.com>
---
 tools/cmake/Makefile | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile
index f371239..d6f03e4 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)),)



More information about the lede-commits mailing list