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`.
This commit is contained in:
Daniel Hahler 2019-06-23 15:25:30 +02:00 committed by Justin M. Keyes
parent de2e51439e
commit 9ce34050e5

View File

@ -41,15 +41,15 @@ ifeq (,$(BUILD_TOOL))
endif endif
endif endif
BUILD_CMD = $(BUILD_TOOL)
ifneq ($(VERBOSE),) ifneq ($(VERBOSE),)
# Only need to handle Ninja here. Make will inherit the VERBOSE variable. # Only need to handle Ninja here. Make will inherit the VERBOSE variable.
ifeq ($(BUILD_TYPE),Ninja) ifeq ($(BUILD_TYPE),Ninja)
VERBOSE_FLAG := -v BUILD_CMD += -v
endif endif
endif endif
BUILD_CMD = $(BUILD_TOOL) $(VERBOSE_FLAG)
DEPS_CMAKE_FLAGS ?= DEPS_CMAKE_FLAGS ?=
# Back-compat: USE_BUNDLED_DEPS was the old name. # Back-compat: USE_BUNDLED_DEPS was the old name.
USE_BUNDLED ?= $(USE_BUNDLED_DEPS) USE_BUNDLED ?= $(USE_BUNDLED_DEPS)