mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 06:08:08 +00:00
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 <mcpratt@pm.me> Link: https://github.com/openwrt/openwrt/pull/16693 Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
parent
5338c8da6c
commit
3efedda1da
@ -10,29 +10,23 @@ PKG_HASH:=31747ae633213f1eda3842686f83c2aa1412e0f5691d1c14dbbcc67fe7400cea
|
|||||||
|
|
||||||
include $(INCLUDE_DIR)/host-build.mk
|
include $(INCLUDE_DIR)/host-build.mk
|
||||||
|
|
||||||
CONFIGURE_ARGS:=
|
|
||||||
ifneq ($(findstring c,$(OPENWRT_VERBOSE)),)
|
|
||||||
CONFIGURE_ARGS+=--verbose
|
|
||||||
endif
|
|
||||||
|
|
||||||
define Host/Configure
|
define Host/Configure
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Host/Compile
|
define Host/Compile
|
||||||
cd $(HOST_BUILD_DIR) && \
|
cd $(HOST_BUILD_DIR) && \
|
||||||
|
$(HOST_MAKE_VARS) \
|
||||||
CXX="$(HOSTCXX_NOCACHE)" \
|
CXX="$(HOSTCXX_NOCACHE)" \
|
||||||
CXXFLAGS="$(HOST_CXXFLAGS) $(HOST_CPPFLAGS)" \
|
$(STAGING_DIR_HOST)/bin/$(PYTHON) configure.py \
|
||||||
LDFLAGS="$(HOST_LDFLAGS)" \
|
--bootstrap \
|
||||||
$(STAGING_DIR_HOST)/bin/$(PYTHON) configure.py --bootstrap $(CONFIGURE_ARGS)
|
--verbose
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Host/Install
|
define Host/Install
|
||||||
$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
|
|
||||||
$(INSTALL_BIN) $(HOST_BUILD_DIR)/ninja $(STAGING_DIR_HOST)/bin/
|
$(INSTALL_BIN) $(HOST_BUILD_DIR)/ninja $(STAGING_DIR_HOST)/bin/
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Host/Clean
|
define Host/Clean
|
||||||
$(call Host/Clean/Default)
|
|
||||||
rm -f $(STAGING_DIR_HOST)/bin/ninja
|
rm -f $(STAGING_DIR_HOST)/bin/ninja
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user