Fix ninja BTLS build for verbose builds (#5673)
authorMarek Habersack <grendel@twistedcode.net>
Mon, 2 Oct 2017 14:15:45 +0000 (16:15 +0200)
committerAlexander Köplinger <alex.koeplinger@outlook.com>
Mon, 2 Oct 2017 14:15:45 +0000 (16:15 +0200)
ninja treats `VERBOSE=1` as a target and, failing to find one, aborts
the build with an error. Pass `-v` in this case instead.

mono/btls/Makefile.am

index 713826839958b8dfb9d57f717b50dc6039e8e814..0902fb41fb84df8430700f6c918665f6e7f4e45a 100644 (file)
@@ -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)