From 9d9f691d26eda845ebf09f18985502e4f8b5b571 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Wed, 22 Aug 2018 13:56:21 +0200 Subject: [PATCH] Revert "build: extract common code from NODE_EXE/_G_EXE" This reverts commit 4e2fa8b0dc1acd95f558cd5f123711b9cc936c72. Refs: https://github.com/nodejs/node/issues/22457 PR-URL: https://github.com/nodejs/node/pull/22458 Reviewed-By: Richard Lau Reviewed-By: James M Snell Reviewed-By: Colin Ihrig Reviewed-By: Anna Henningsen Reviewed-By: Joyee Cheung Reviewed-By: Ruben Bridgewater --- Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index f3372b096316af..3ca83bfed85ead 100644 --- 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