Skip to content
Browse files

Bumped v8 to newest version.

  • Loading branch information...
1 parent 3d1ace4 commit 940eaecc1592cc224dbee0e5b73c7b90bc3908a0 @Licenser committed Apr 15, 2012
Showing with 15 additions and 5 deletions.
  1. +15 −5 Makefile
View
20 Makefile
@@ -1,16 +1,18 @@
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
+V8FLAGS=x64
else
V8FLAGS=
endif
ifeq ($(X64L),1)
-V8FLAGS=arch=x64
-V8ENV=CCFLAGS=-fPIC
+V8FLAGS=x64
+V8ENV="CCFLAGS=-fPIC;$(V8ENV)"
endif
ifeq ($(LINUX),1)
@@ -30,9 +32,17 @@ deps/zeromq2/.git/HEAD:
@git submodule init
@git submodule update
-deps/v8/libv8.a: deps/v8/.git/config
+deps/v8/libv8.a: deps/v8/.git/config
+ifeq ($(OSX),1)
+ifeq ($(V8FLAGS),"")
+ cd deps/v8 && scons
+else
+ cd deps/v8 && scons arch=$(V8FLAGS)
+endif
+else
@cd deps/v8 && make dependencies
- @cd deps/v8 && $(V8ENV) make $(V8FLAGS)
+ cd deps/v8 && $(V8ENV) make $(V8FLAGS)
+endif
deps/zeromq2/src/.libs/libzmq.a: deps/zeromq2/.git/HEAD
@cd deps/zeromq2 && ./autogen.sh && ./configure $(ZMQ_FLAGS) && make

0 comments on commit 940eaec

Please sign in to comment.
Something went wrong with that request. Please try again.