Revert "build: extract common code from NODE_EXE/_G_EXE"

This reverts commit 4e2fa8b. Refs: #22457 PR-URL: #22458 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>
nodejs · Aug 22, 2018 · 9d9f691 · 9d9f691
1 parent 68b07de
commit 9d9f691
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -90,20 +90,18 @@ help: ## Print help for targets with comments.
 # to check for changes.
 .PHONY: $(NODE_EXE) $(NODE_G_EXE)
 
-define build_node_exe
-$(MAKE) -C out BUILDTYPE=$1 V=$(V)
 # The -r/-L check stops it recreating the link if it is already in place,
 # otherwise $(NODE_EXE) being a .PHONY target means it is always re-run.
 # Without the check there is a race condition between the link being deleted
 # and recreated which can break the addons build when running test-ci
 # See comments on the build-addons target for some more info
-if [ ! -r $@ -o ! -L $@ ]; then ln -fs out/$1/$(NODE_EXE) $@; fi
-endef
 $(NODE_EXE): config.gypi out/Makefile
-	@$(call build_node_exe,"Release")
+	$(MAKE) -C out BUILDTYPE=Release V=$(V)
+	if [ ! -r $@ -o ! -L $@ ]; then ln -fs out/Release/$(NODE_EXE) $@; fi
 
 $(NODE_G_EXE): config.gypi out/Makefile
-	@$(call build_node_exe,"Debug")
+	$(MAKE) -C out BUILDTYPE=Debug V=$(V)
+	if [ ! -r $@ -o ! -L $@ ]; then ln -fs out/Debug/$(NODE_EXE) $@; fi
 
 CODE_CACHE_DIR ?= out/$(BUILDTYPE)/obj/gen
 CODE_CACHE_FILE ?= $(CODE_CACHE_DIR)/node_code_cache.cc