From 3fea9d38782f9c42a606206b1318f1e5508cf62a Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Tue, 25 Aug 2015 14:30:13 -0400
Subject: 'make node' compiles!

---
 scripts/main.mk | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'scripts/main.mk')

diff --git a/scripts/main.mk b/scripts/main.mk
index d61a61e034..451f6a0d06 100644
--- a/scripts/main.mk
+++ b/scripts/main.mk
@@ -70,7 +70,6 @@ config/%.gypi: $(SUBMODULES) configure $(CONFIGURE_FILES)
 #### Build files ###############################################################
 
 GYP_FLAGS += -Dhost=$(HOST)
-GYP_FLAGS += -Iconfig/$(HOST_SLUG).gypi
 GYP_FLAGS += -Dplatform_lib=$(PLATFORM)
 GYP_FLAGS += -Dhttp_lib=$(HTTP)
 GYP_FLAGS += -Dasset_lib=$(ASSET)
@@ -85,15 +84,28 @@ GYP_FLAGS += --generator-output=./build/$(HOST_SLUG)
 .PHONY: Makefile/__project__
 Makefile/__project__: print-env $(SUBMODULES) config/$(HOST_SLUG).gypi
 	@printf "$(TEXT_BOLD)$(COLOR_GREEN)* Recreating project...$(FORMAT_END)\n"
-	$(QUIET)$(ENV) deps/run_gyp gyp/$(HOST).gyp $(GYP_FLAGS) -f make$(GYP_FLAVOR_SUFFIX)
+	$(QUIET)$(ENV) deps/run_gyp gyp/$(HOST).gyp $(GYP_FLAGS) \
+		-Iconfig/$(HOST_SLUG).gypi -f make$(GYP_FLAVOR_SUFFIX)
 
 .PHONY: Xcode/__project__
 Xcode/__project__: print-env $(SUBMODULES) config/$(HOST_SLUG).gypi
 	@printf "$(TEXT_BOLD)$(COLOR_GREEN)* Recreating project...$(FORMAT_END)\n"
-	$(QUIET)$(ENV) deps/run_gyp gyp/$(HOST).gyp $(GYP_FLAGS) -f xcode$(GYP_FLAVOR_SUFFIX)
+	$(QUIET)$(ENV) deps/run_gyp gyp/$(HOST).gyp $(GYP_FLAGS) \
+		-Iconfig/$(HOST_SLUG).gypi -f xcode$(GYP_FLAVOR_SUFFIX)
 
 #### Build individual targets ##################################################
 
+NODE_PRE_GYP = $(shell cd platform/node && npm bin)/node-pre-gyp
+node/configure:
+	cd platform/node && $(NODE_PRE_GYP) configure --clang -- \
+	$(GYP_FLAGS) -I../../config/$(HOST_SLUG).gypi \
+	-Dlibuv_ldflags= -Dlibuv_static_libs=
+
+Makefile/node: Makefile/__project__ node/configure
+	@printf "$(TEXT_BOLD)$(COLOR_GREEN)* Building target node...$(FORMAT_END)\n"
+	cd platform/node && $(NODE_PRE_GYP) build --clang -- \
+	-j$(JOBS)
+
 Makefile/%: Makefile/__project__
 	@printf "$(TEXT_BOLD)$(COLOR_GREEN)* Building target $*...$(FORMAT_END)\n"
 	$(QUIET)$(ENV) $(MAKE) -C build/$(HOST_SLUG) BUILDTYPE=$(BUILDTYPE) $*
-- 
cgit v1.2.1