Skip to content

Commit f215445

Browse files
committed
Fix nodejs#3761 build: Default to V=1
1 parent 1513848 commit f215445

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

Makefile

+10-5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ BUILDTYPE ?= Release
44
PYTHON ?= python
55
DESTDIR ?=
66

7+
# Default to verbose builds.
8+
# To do quite/pretty builds, run `make V=` to set V to an empty string,
9+
# or set the V environment variable to an empty string.
10+
V ?= 1
11+
712
# BUILDTYPE=Debug builds both release and debug builds. If you want to compile
813
# just the debug build, run `make -C out BUILDTYPE=Debug` instead.
914
ifeq ($(BUILDTYPE),Release)
@@ -17,18 +22,18 @@ endif
1722
.PHONY: node node_g
1823

1924
node: config.gypi
20-
$(MAKE) -C out BUILDTYPE=Release
25+
$(MAKE) -C out BUILDTYPE=Release V=$(V)
2126
ln -fs out/Release/node node
2227

2328
node_g: config.gypi
24-
$(MAKE) -C out BUILDTYPE=Debug
29+
$(MAKE) -C out BUILDTYPE=Debug V=$(V)
2530
ln -fs out/Debug/node node_g
2631

2732
config.gypi: configure
2833
./configure
2934

3035
out/Debug/node:
31-
$(MAKE) -C out BUILDTYPE=Debug
36+
$(MAKE) -C out BUILDTYPE=Debug V=$(V)
3237

3338
out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp deps/v8/build/common.gypi deps/v8/tools/gyp/v8.gyp node.gyp config.gypi
3439
$(PYTHON) tools/gyp_node -f make
@@ -201,10 +206,10 @@ $(PKG):
201206
rm -rf $(PKGDIR)
202207
rm -rf out/deps out/Release
203208
./configure --prefix=$(PKGDIR)/32/usr/local --without-snapshot --dest-cpu=ia32
204-
$(MAKE) install
209+
$(MAKE) install V=$(V)
205210
rm -rf out/deps out/Release
206211
./configure --prefix=$(PKGDIR)/usr/local --without-snapshot --dest-cpu=x64
207-
$(MAKE) install
212+
$(MAKE) install V=$(V)
208213
lipo $(PKGDIR)/32/usr/local/bin/node \
209214
$(PKGDIR)/usr/local/bin/node \
210215
-output $(PKGDIR)/usr/local/bin/node-universal \

0 commit comments

Comments
 (0)