Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #70 from Licenser/master

updated v8
  • Loading branch information...
commit 3e5bea8c7716d27ae18ac9af2a6a7936d0a6ee74 2 parents 2ded86a + a213abb
Yurii Rashkovskii yrashk authored
Showing with 6 additions and 4 deletions.
  1. +4 −2 Makefile
  2. +1 −1  deps/v8
  3. +1 −1  deps/zeromq2
6 Makefile
View
@@ -1,7 +1,9 @@
X64=$(shell file -L `which epmd` | grep x86_64 | wc -l | xargs echo)
X64L=$(shell file -L `which epmd` | grep x86-64 | wc -l | xargs echo)
+OSX=$(shell uname | grep Darwin | wc -l | xargs echo)
LINUX=$(shell uname | grep Linux | wc -l | xargs echo)
+V8ENV=GYPFLAGS="-f make"
ifeq ($(X64),1)
V8FLAGS=arch=x64
else
@@ -30,8 +32,8 @@ deps/zeromq2/.git/HEAD:
@git submodule init
@git submodule update
-deps/v8/libv8.a: deps/v8/.git/config
- @cd deps/v8 && $(V8ENV) scons $(V8FLAGS)
+deps/v8/libv8.a: deps/v8/.git/config
+ cd deps/v8 && $(V8ENV) scons $(V8FLAGS)
deps/zeromq2/src/.libs/libzmq.a: deps/zeromq2/.git/HEAD
@cd deps/zeromq2 && ./autogen.sh && ./configure $(ZMQ_FLAGS) && make
2  deps/v8
@@ -1 +1 @@
-Subproject commit a2240d918e44670ea2b90f331b4c3a5dff6dae69
+Subproject commit a1e3ff82b79ab8d92cebc9133fca3b15b00d5921
2  deps/zeromq2
@@ -1 +1 @@
-Subproject commit fb64b8801cd02776e1524aedc41083f9bf876e4d
+Subproject commit 2bdb487abbe69984ec264ddcb785e032e1b0419f
Please sign in to comment.
Something went wrong with that request. Please try again.