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

use native target

This commit is contained in:
Frank Celler 2012-04-16 15:44:01 +02:00
parent d746e9e84b
commit 6318639a16
4 changed files with 7 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.all-in-one
View File

@ -47,20 +47,6 @@ BUILT_SOURCES += @LIBEV_LIBS@
## V8
################################################################################
if ENABLE_DARWIN
V8_BUILD_VERSION=native
else
if ENABLE_64BIT
V8_BUILD_VERSION=x64
else
if ENABLE_32BIT
V8_BUILD_VERSION=ia32
endif
endif
endif
BUILT_SOURCES += @V8_LIBS@
@V8_LIBS@: .v8-build
@ -72,7 +58,7 @@ BUILT_SOURCES += @V8_LIBS@
@echo "--------------------------------------------------------------------------------"
@echo
cd @top_srcdir@/3rdParty/V8 && make library=static snapshot=off $(V8_BUILD_VERSION).release
cd @top_srcdir@/3rdParty/V8 && make library=static snapshot=off native
touch .v8-build

11
Makefile.in
View File

@ -92,6 +92,9 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.all-in-one \
################################################################################
################################################################################
@ENABLE_BISON_TRUE@am__append_2 = $(BISON_FILES) $(BISONXX_FILES)
################################################################################
################################################################################
@ENABLE_ALL_IN_ONE_TRUE@am__append_3 = @LIBEV_LIBS@ @V8_LIBS@
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@ -967,12 +970,6 @@ UNITTESTS_CLIENT = $(addprefix --unit-tests ,$(SHELL_CLIENT))
@ENABLE_ALL_IN_ONE_TRUE@@ENABLE_FORCE_32BIT_TRUE@LIBEV_CFLAGS_32 = -m32 -O2 -g
@ENABLE_ALL_IN_ONE_TRUE@@ENABLE_FORCE_32BIT_FALSE@LIBEV_LDFLAGS_32 =
@ENABLE_ALL_IN_ONE_TRUE@@ENABLE_FORCE_32BIT_TRUE@LIBEV_LDFLAGS_32 = -m32
@ENABLE_32BIT_TRUE@@ENABLE_64BIT_FALSE@@ENABLE_ALL_IN_ONE_TRUE@@ENABLE_DARWIN_FALSE@V8_BUILD_VERSION = ia32
@ENABLE_64BIT_TRUE@@ENABLE_ALL_IN_ONE_TRUE@@ENABLE_DARWIN_FALSE@V8_BUILD_VERSION = x64
################################################################################
################################################################################
@ENABLE_ALL_IN_ONE_TRUE@@ENABLE_DARWIN_TRUE@V8_BUILD_VERSION = native
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
@ -2949,7 +2946,7 @@ unittests-http-server:
@ENABLE_ALL_IN_ONE_TRUE@ @echo "--------------------------------------------------------------------------------"
@ENABLE_ALL_IN_ONE_TRUE@ @echo
@ENABLE_ALL_IN_ONE_TRUE@ cd @top_srcdir@/3rdParty/V8 && make library=static snapshot=off $(V8_BUILD_VERSION).release
@ENABLE_ALL_IN_ONE_TRUE@ cd @top_srcdir@/3rdParty/V8 && make library=static snapshot=off native
@ENABLE_ALL_IN_ONE_TRUE@ touch .v8-build

15
configure vendored
View File

@ -8358,20 +8358,7 @@ FLAG_INFO="$FLAG_INFO|."
V8_CPPFLAGS="-I${srcdir}/3rdParty/V8/include"
V8_LDFLAGS=""
if test "x$tr_DARWIN" == xyes; then
if test "x$tr_BITS" == x64; then
V8_LIBS="${srcdir}/3rdParty/V8/libv8_x64.a"
else
V8_LIBS="${srcdir}/3rdParty/V8/libv8_ia32.a"
fi
else
if test "x$tr_BITS" == x64; then
V8_LIBS="${srcdir}/3rdParty/V8/out/x64.release/obj.target/tools/gyp/libv8_base.a ${srcdir}/3rdParty/V8/out/x64.release/obj.target/tools/gyp/libv8_nosnapshot.a"
else
V8_LIBS="${srcdir}/3rdParty/V8/out/ia32.release/obj.target/tools/gyp/libv8_base.a ${srcdir}/3rdParty/V8/out/ia32.release/obj.target/tools/gyp/libv8_nosnapshot.a"
fi
fi
V8_LIBS="${srcdir}/3rdParty/V8/native/libv8_base.a ${srcdir}/3rdParty/V8/out/native/libv8_nosnapshot.a"
TRI_V8_VERSION="3.10.2"

15
m4/all-in-one.v8
View File

@ -6,20 +6,7 @@ dnl ----------------------------------------------------------------------------
V8_CPPFLAGS="-I${srcdir}/3rdParty/V8/include"
V8_LDFLAGS=""
if test "x$tr_DARWIN" == xyes; then
if test "x$tr_BITS" == x64; then
V8_LIBS="${srcdir}/3rdParty/V8/libv8_x64.a"
else
V8_LIBS="${srcdir}/3rdParty/V8/libv8_ia32.a"
fi
else
if test "x$tr_BITS" == x64; then
V8_LIBS="${srcdir}/3rdParty/V8/out/x64.release/obj.target/tools/gyp/libv8_base.a ${srcdir}/3rdParty/V8/out/x64.release/obj.target/tools/gyp/libv8_nosnapshot.a"
else
V8_LIBS="${srcdir}/3rdParty/V8/out/ia32.release/obj.target/tools/gyp/libv8_base.a ${srcdir}/3rdParty/V8/out/ia32.release/obj.target/tools/gyp/libv8_nosnapshot.a"
fi
fi
V8_LIBS="${srcdir}/3rdParty/V8/native/libv8_base.a ${srcdir}/3rdParty/V8/out/native/libv8_nosnapshot.a"
TRI_V8_VERSION="3.10.2"