Explorar o código

tools/ninja: cleanup Makefile

Use default CXXFLAGS and LDFLAGS variables.

Directly add --verbose flag without a variable.

Split up lines for script arguments.

Delete unnecessary lines.

Signed-off-by: Michael Pratt <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/16693
Signed-off-by: Robert Marko <[email protected]>
Michael Pratt hai 1 ano
pai
achega
3efedda1da
Modificáronse 1 ficheiros con 4 adicións e 10 borrados
  1. 4 10
      tools/ninja/Makefile

+ 4 - 10
tools/ninja/Makefile

@@ -10,29 +10,23 @@ PKG_HASH:=31747ae633213f1eda3842686f83c2aa1412e0f5691d1c14dbbcc67fe7400cea
 
 include $(INCLUDE_DIR)/host-build.mk
 
-CONFIGURE_ARGS:=
-ifneq ($(findstring c,$(OPENWRT_VERBOSE)),)
-  CONFIGURE_ARGS+=--verbose
-endif
-
 define Host/Configure
 endef
 
 define Host/Compile
 	cd $(HOST_BUILD_DIR) && \
+		$(HOST_MAKE_VARS) \
 		CXX="$(HOSTCXX_NOCACHE)" \
-		CXXFLAGS="$(HOST_CXXFLAGS) $(HOST_CPPFLAGS)" \
-		LDFLAGS="$(HOST_LDFLAGS)" \
-		$(STAGING_DIR_HOST)/bin/$(PYTHON) configure.py --bootstrap $(CONFIGURE_ARGS)
+		$(STAGING_DIR_HOST)/bin/$(PYTHON) configure.py \
+			--bootstrap \
+			--verbose
 endef
 
 define Host/Install
-	$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
 	$(INSTALL_BIN) $(HOST_BUILD_DIR)/ninja $(STAGING_DIR_HOST)/bin/
 endef
 
 define Host/Clean
-	$(call Host/Clean/Default)
 	rm -f $(STAGING_DIR_HOST)/bin/ninja
 endef