Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build and gyp fixes #23156

Merged
merged 4 commits into from
Oct 2, 2018
Merged

Build and gyp fixes #23156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6dd4a07
build: reduce chance of unneeded rebuild
refack Sep 30, 2018
375e16e
build: encapsulate node/inspector gyp scafolding
refack Sep 27, 2018
731a72f
tools,gyp: cosmetic change to GYP `make` generator outputs
refack Sep 27, 2018
5d8373a
tools,gyp: don't force build actions with multiple outputs
refack Sep 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ available-node = \
# BUILDTYPE=Debug builds both release and debug builds. If you want to compile
# just the debug build, run `make -C out BUILDTYPE=Debug` instead.
ifeq ($(BUILDTYPE),Release)
all: out/Makefile $(NODE_EXE) ## Default target, builds node in out/Release/node.
all: $(NODE_EXE) ## Default target, builds node in out/Release/node.
else
all: out/Makefile $(NODE_EXE) $(NODE_G_EXE)
addaleax marked this conversation as resolved.
Show resolved Hide resolved
all: $(NODE_EXE) $(NODE_G_EXE)
endif

.PHONY: help
Expand Down
4 changes: 2 additions & 2 deletions common.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
'node_tag%': '',
'uv_library%': 'static_library',

'clang%': 0,

'openssl_fips%': '',

# Default to -O0 for debug builds.
Expand Down Expand Up @@ -91,8 +93,6 @@
}],
['OS=="mac"', {
'clang%': 1,
}, {
'clang%': 0,
addaleax marked this conversation as resolved.
Show resolved Hide resolved
}],
],
},
Expand Down
Loading