Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Kaveh Vahedipour 2016-02-16 10:47:49 +01:00
parent 45d6575e66 133148e153
commit 2fa212796d
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
3rdParty/Makefile.v8 vendored
View File

@ -28,6 +28,8 @@ endif
V8DIR=@V8_DIR@
export PYTHON_EXECUTABLE=@PYTHON_EXECUTABLE@
@V8_LIBS@: @srcdir@/.v8-build-@TRI_BITS@
@srcdir@/.v8-build-@TRI_BITS@:
@ -45,7 +47,7 @@ if ENABLE_ARMV6
if ENABLE_V8_DEBUG
cd @top_srcdir@/3rdParty/$(V8DIR) \
&& export GYPFLAGS="-Darm_fpu=vfp -Darm_version=6 -Dstandalone_static_library=1 $(GOLD_V8_GYP)" \
&& $(MAKE) \
&& $(MAKE) -f Makefile-v8 \
CC="$(CC)" \
CC.host="$(CC)" \
CXX="$(CXX)" \
@ -59,7 +61,7 @@ if ENABLE_V8_DEBUG
else
cd @top_srcdir@/3rdParty/$(V8DIR) \
&& export GYPFLAGS="-Darm_fpu=vfp -Darm_version=6 -Dstandalone_static_library=1 $(GOLD_V8_GYP)" \
&& $(MAKE) \
&& $(MAKE) -f Makefile-v8 \
CC="$(CC)" \
CC.host="$(CC)" \
CXX="$(CXX)" \
@ -80,7 +82,7 @@ if ENABLE_ARMV7
if ENABLE_V8_DEBUG
cd @top_srcdir@/3rdParty/$(V8DIR) \
&& export GYPFLAGS="-Darm_fpu=vfp -Darm_version=6 -Dstandalone_static_library=1 $(GOLD_V8_GYP)" \
&& $(MAKE) \
&& $(MAKE) -f Makefile-v8 \
CC="$(CC)" \
CC.host="$(CC)" \
CXX="$(CXX)" \
@ -94,7 +96,7 @@ if ENABLE_V8_DEBUG
else
cd @top_srcdir@/3rdParty/$(V8DIR) \
&& export GYPFLAGS=" -Darm_version=7 -Dstandalone_static_library=1 $(GOLD_V8_GYP)" \
&& $(MAKE) \
&& $(MAKE) -f Makefile-v8 \
CC="$(CC)" \
CC.host="$(CC)" \
CXX="$(CXX)" \
@ -115,7 +117,7 @@ if ENABLE_DARWIN
if ENABLE_V8_DEBUG
cd @top_srcdir@/3rdParty/$(V8DIR) \
&& export GYPFLAGS="-Dstandalone_static_library=1 $(GOLD_V8_GYP)" \
&& $(MAKE) \
&& $(MAKE) -f Makefile-v8 \
CC="$(CC)" \
CC.host="$(CC)" \
CXX="$(CXX)" \
@ -134,7 +136,7 @@ if ENABLE_V8_DEBUG
else # ! ENABLE_V8_DEBUG
cd @top_srcdir@/3rdParty/$(V8DIR) \
&& export GYPFLAGS="-Dstandalone_static_library=1 $(GOLD_V8_GYP)" \
&& $(MAKE) \
&& $(MAKE) -f Makefile-v8 \
CC="$(CC)" \
CC.host="$(CC)" \
CXX="$(CXX)" \
@ -154,7 +156,7 @@ else # ! ENABLE_DARWIN
if ENABLE_V8_DEBUG
cd @top_srcdir@/3rdParty/$(V8DIR) \
&& export GYPFLAGS="-Dstandalone_static_library=1 $(GOLD_V8_GYP)" \
&& $(MAKE) \
&& $(MAKE) -f Makefile-v8 \
CC="$(CC)" \
CC.host="$(CC)" \
CXX="$(CXX)" \
@ -167,7 +169,7 @@ if ENABLE_V8_DEBUG
else # ! ENABLE_V8_DEBUG
cd @top_srcdir@/3rdParty/$(V8DIR) \
&& export GYPFLAGS="-Dstandalone_static_library=1 $(GOLD_V8_GYP)" \
&& $(MAKE) \
&& $(MAKE) -f Makefile-v8 \
CC="$(CC)" \
CC.host="$(CC)" \
CXX="$(CXX)" \

3
configure.ac
View File

@ -88,7 +88,8 @@ else:
echo "Compiling V8 requires a python version 2; please adjust your " `which python`
exit 1
fi
PYTHON_EXECUTABLE=`which python`
AC_SUBST(PYTHON_EXECUTABLE)
dnl ----------------------------------------------------------------------------
dnl check for special OS like MacOS X or FreeBSD
dnl ----------------------------------------------------------------------------