Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

OS-1388 illumos-extra node build failure

  • Loading branch information...
commit 0d21b6627d5de6af9880ac2873e2276b59ad552e 1 parent 15f18d0
@jjelinek jjelinek authored
Showing with 6 additions and 4 deletions.
  1. +3 −2 Makefile.targ
  2. +3 −2 node.js/Makefile
View
5 Makefile.targ
@@ -36,13 +36,14 @@ install_autoconf_32: all
mkdir -p $(DESTDIR)
(cd $(VER.32); \
env - PATH=$(PATH) \
- $(MAKE) $(install_PARALLEL) DESTDIR=$(DESTDIR) install)
+ $(MAKE) $(install_PARALLEL) $(OVERRIDES) DESTDIR=$(DESTDIR) install)
install_autoconf_64: all
mkdir -p $(DESTDIR)
(cd $(VER.64); \
env - PATH=$(PATH) \
- $(MAKE) $(install_PARALLEL) DESTDIR=$(DESTDIR) install)
+ $(MAKE) $(install_PARALLEL) $(OVERRIDES.64) DESTDIR=$(DESTDIR) \
+ install)
$(AUTOCONF_OUT.32): $(VER.32)/configure
(cd $(VER.32); \
View
5 node.js/Makefile
@@ -46,9 +46,11 @@ OVERRIDES += $(AUTOCONF_ENV)
AUTOCONF_OUT = build/default/config.h
+all: all_autoconf
+
# - platform_node_version.js is autogenerated with the current node version
# - we move man pages as we want them in /usr/node/0.8/man
-install: all
+install: install_autoconf
mkdir -p $(DESTDIR)/usr/node/$(MAJOR_VER)/node_modules
./build_require_platform_node_version.sh \
$(DESTDIR)/usr/node/$(MAJOR_VER)/bin/node \
@@ -58,4 +60,3 @@ install: all
$(DESTDIR)/usr/node/$(MAJOR_VER)/
include ../Makefile.targ
-include ../Makefile.targ.autoconf
Please sign in to comment.
Something went wrong with that request. Please try again.