From: Marek Habersack Date: Mon, 2 Oct 2017 14:15:45 +0000 (+0200) Subject: Fix ninja BTLS build for verbose builds (#5673) X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=mono.git;a=commitdiff_plain;h=120574de1935e11c7b39a0be75bb2803453ceadb Fix ninja BTLS build for verbose builds (#5673) ninja treats `VERBOSE=1` as a target and, failing to find one, aborts the build with an error. Pass `-v` in this case instead. --- diff --git a/mono/btls/Makefile.am b/mono/btls/Makefile.am index 71382683995..0902fb41fb8 100644 --- a/mono/btls/Makefile.am +++ b/mono/btls/Makefile.am @@ -39,6 +39,7 @@ MONO_BTLS_SOURCES_FILES = \ EXTRA_DIST = $(MONO_BTLS_SOURCES_FILES) CMAKE_VERBOSE=$(if $(V),VERBOSE=1,) +NINJA_VERBOSE=$(if ($V),-v,) if NINJA NINJA_ARGS = -G Ninja @@ -59,7 +60,7 @@ build-shared/$(BUILDFILE): if NINJA build-shared/libmono-btls-shared$(libsuffix): build-shared/$(BUILDFILE) $(MONO_BTLS_SOURCES_FILES) - ninja -C build-shared $(CMAKE_VERBOSE) + ninja -C build-shared $(NINJA_VERBOSE) else build-shared/libmono-btls-shared$(libsuffix): build-shared/$(BUILDFILE) $(MONO_BTLS_SOURCES_FILES) $(MAKE) -C build-shared $(CMAKE_VERBOSE)