Setup ninja verbose option at the workflow scripts

When building wasi-sdk locally, we doesn't need so verbose output that not easily distinguish
the error command from the normal command. So refactoring -v option into workflow scripts

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>

.github/workflows/main.yml

@@ -36,10 +36,10 @@ jobs:
         run: sudo apt install ninja-build
         if: matrix.os == 'ubuntu-latest'
       - name: Build
-        run: make package
+        run: NINJA_FLAGS=-v make package
         shell: bash
       - name: Run the testsuite
-        run: make check
+        run: NINJA_FLAGS=-v make check
         if: matrix.os == 'ubuntu-latest'
       - name: Upload artifacts
         uses: actions/upload-artifact@v1

Makefile

@@ -67,7 +67,7 @@ build/llvm.BUILT:
 		     -DDEFAULT_SYSROOT=$(PREFIX)/share/wasi-sysroot) \
 		-DLLVM_INSTALL_BINUTILS_SYMLINKS=TRUE \
 		$(LLVM_PROJ_DIR)/llvm
-	DESTDIR=$(DESTDIR) ninja $(NINJA_FLAGS) -v -C build/llvm \
+	DESTDIR=$(DESTDIR) ninja $(NINJA_FLAGS) -C build/llvm \
 		install-clang \
 		install-clang-format \
 		install-clang-tidy \
@@ -119,7 +119,7 @@ build/compiler-rt.BUILT: build/llvm.BUILT build/wasi-libc.BUILT
 		-DCMAKE_INSTALL_PREFIX=$(PREFIX)/lib/clang/$(CLANG_VERSION)/ \
 		-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
 		$(LLVM_PROJ_DIR)/compiler-rt/lib/builtins
-	DESTDIR=$(DESTDIR) ninja $(NINJA_FLAGS) -v -C build/compiler-rt install
+	DESTDIR=$(DESTDIR) ninja $(NINJA_FLAGS) -C build/compiler-rt install
 	# Install clang-provided headers.
 	cp -R $(ROOT_DIR)/build/llvm/lib/clang $(BUILD_PREFIX)/lib/
 	touch build/compiler-rt.BUILT
@@ -160,9 +160,9 @@ build/libcxx.BUILT: build/llvm.BUILT build/compiler-rt.BUILT build/wasi-libc.BUI
 		-DCMAKE_CXX_FLAGS="$(DEBUG_PREFIX_MAP) \
 		-DLIBCXX_LIBDIR_SUFFIX=$(ESCAPE_SLASH)/wasm32-wasi \
 		$(LLVM_PROJ_DIR)/libcxx
-	ninja $(NINJA_FLAGS) -v -C build/libcxx
+	ninja $(NINJA_FLAGS) -C build/libcxx
 	# Do the install.
-	DESTDIR=$(DESTDIR) ninja $(NINJA_FLAGS) -v -C build/libcxx install
+	DESTDIR=$(DESTDIR) ninja $(NINJA_FLAGS) -C build/libcxx install
 	touch build/libcxx.BUILT
 
 # Flags for libcxxabi.
@@ -202,9 +202,9 @@ build/libcxxabi.BUILT: build/libcxx.BUILT build/llvm.BUILT
 		-DCMAKE_CXX_FLAGS="$(DEBUG_PREFIX_MAP) \
 		-DLIBCXXABI_LIBDIR_SUFFIX=$(ESCAPE_SLASH)/wasm32-wasi \
 		$(LLVM_PROJ_DIR)/libcxxabi
-	ninja $(NINJA_FLAGS) -v -C build/libcxxabi
+	ninja $(NINJA_FLAGS) -C build/libcxxabi
 	# Do the install.
-	DESTDIR=$(DESTDIR) ninja $(NINJA_FLAGS) -v -C build/libcxxabi install
+	DESTDIR=$(DESTDIR) ninja $(NINJA_FLAGS) -C build/libcxxabi install
 	touch build/libcxxabi.BUILT
 
 build/config.BUILT:

docker_build.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 set -e
 docker build -t wasi-sdk-builder:latest .
-docker run --mount type=bind,src=$PWD,target=/workspace --workdir /workspace  wasi-sdk-builder:latest make package
+docker run --mount type=bind,src=$PWD,target=/workspace -e NINJA_FLAGS=-v --workdir /workspace wasi-sdk-builder:latest make package