cmake: properly pass host cflags/ldflags to the build

[openwrt/openwrt.git] / tools / cmake / Makefile

diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile
index 489c27f1d825ab47a97a6a89fed1fcfa42e0dab5..f3712391a6acf1127ceaffa4590b86f77a3a54dd 100644 (file)
--- a/tools/cmake/Makefile
+++ b/tools/cmake/Makefile
@@ -7,23 +7,31 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cmake
-PKG_VERSION:=3.7.0
+PKG_VERSION:=3.7.1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://cmake.org/files/v3.7/ \
                https://fossies.org/linux/misc/
-PKG_MD5SUM:=3801dc4e54c1c957a7378d8b0d4254ba
+PKG_HASH:=449a5bce64dbd4d5b9517ebd1a1248ed197add6ad27934478976fd5f1f9330e1
 
 HOST_BUILD_PARALLEL:=1
 HOST_CONFIGURE_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 
-HOST_CONFIGURE_CMD := MAKEFLAGS="$(HOST_JOBS)" $(BASH) ./configure
+HOST_CONFIGURE_CMD := \
+       MAKEFLAGS="$(HOST_JOBS)" \
+       $(BASH) ./configure \
+               $(if $(MAKE_JOBSERVER),--parallel="$(MAKE_JOBSERVER)")
 
-HOST_CONFIGURE_VARS :=
+HOST_CONFIGURE_VARS += \
+       CXXFLAGS="$(HOST_CFLAGS)"
 
 HOST_CONFIGURE_ARGS := \
        --prefix=$(STAGING_DIR_HOST)
 
+ifneq ($(findstring c,$(OPENWRT_VERBOSE)),)
+  HOST_MAKE_FLAGS += VERBOSE=1
+endif
+
 $(eval $(call HostBuild))