Skip to content

Commit c4e9dc8

Browse files
committed
set '-s' only if VERBOSE is not set
1 parent 0c87746 commit c4e9dc8

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/Makevars.in

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,17 @@ ifdef TBB_LIB
1111
PKG_LIBS = -Wl,-L,"$(TBB_LIB)" -Wl,-rpath,"$(TBB_LIB)" -ltbb -ltbbmalloc
1212
endif
1313

14+
ifeq ($(VERBOSE),)
15+
SILENT = -s
16+
endif
17+
1418
ifeq ($(OS), Windows_NT)
1519

1620
USE_TBB=Windows
1721
TBB_COPY_PATTERN=tbb*.dll
1822

1923
MAKE = make
20-
MAKEFLAGS = -e -s -j1
24+
MAKEFLAGS = -e $(SILENT) -j1
2125
MAKE_CMD = \
2226
MSYS2_ARG_CONV_EXCL="*" \
2327
CYGWIN=nodosfilewarning \
@@ -45,7 +49,7 @@ else
4549
endif
4650
endif
4751

48-
MAKEFLAGS += -e -s
52+
MAKEFLAGS += -e $(SILENT)
4953
MAKE_CMD = \
5054
CONLY="@CC@ $(PKG_CPPFLAGS) @CPPFLAGS@" \
5155
CPLUS="@CXX11@ $(PKG_CPPFLAGS) @CPPFLAGS@" \

0 commit comments

Comments
 (0)