From 9ce34050e549baf2c85e23fc3370f3ffebc773ad Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 23 Jun 2019 15:25:30 +0200 Subject: [PATCH] Makefile: fix trailing space in BUILD_CMD #10312 Only append flag for verbosity with ninja if non-empty. Fixes the trailing space with `ninja -C .deps`. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4142cacc51..79dbc27504 100644 --- a/Makefile +++ b/Makefile @@ -41,15 +41,15 @@ ifeq (,$(BUILD_TOOL)) endif endif +BUILD_CMD = $(BUILD_TOOL) + ifneq ($(VERBOSE),) # Only need to handle Ninja here. Make will inherit the VERBOSE variable. ifeq ($(BUILD_TYPE),Ninja) - VERBOSE_FLAG := -v + BUILD_CMD += -v endif endif -BUILD_CMD = $(BUILD_TOOL) $(VERBOSE_FLAG) - DEPS_CMAKE_FLAGS ?= # Back-compat: USE_BUNDLED_DEPS was the old name. USE_BUNDLED ?= $(USE_BUNDLED_DEPS)