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

always use make for V8

This commit is contained in:
Frank Celler 2012-04-16 15:25:30 +02:00
parent 357f45a12e
commit d746e9e84b
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile.all-in-one
View File

@ -47,13 +47,19 @@ BUILT_SOURCES += @LIBEV_LIBS@
## V8 ## V8
################################################################################ ################################################################################
if ENABLE_DARWIN
V8_BUILD_VERSION=native
else
if ENABLE_64BIT if ENABLE_64BIT
V8_BUILD_VERSION=x64 V8_BUILD_VERSION=x64
endif
else
if ENABLE_32BIT if ENABLE_32BIT
V8_BUILD_VERSION=ia32 V8_BUILD_VERSION=ia32
endif endif
endif
endif
BUILT_SOURCES += @V8_LIBS@ BUILT_SOURCES += @V8_LIBS@
@ -66,12 +72,7 @@ BUILT_SOURCES += @V8_LIBS@
@echo "--------------------------------------------------------------------------------" @echo "--------------------------------------------------------------------------------"
@echo @echo
if ENABLE_DARWIN
cd @top_srcdir@/3rdParty/V8 && scons snapshot=off library=static mode=release arch=$(V8_BUILD_VERSION)
cd @top_srcdir@/3rdParty/V8 && mv libv8.a libv8_$(V8_BUILD_VERSION).a
else
cd @top_srcdir@/3rdParty/V8 && make library=static snapshot=off $(V8_BUILD_VERSION).release cd @top_srcdir@/3rdParty/V8 && make library=static snapshot=off $(V8_BUILD_VERSION).release
endif
touch .v8-build touch .v8-build

9
Makefile.in
View File

@ -967,11 +967,12 @@ 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_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_FALSE@LIBEV_LDFLAGS_32 =
@ENABLE_ALL_IN_ONE_TRUE@@ENABLE_FORCE_32BIT_TRUE@LIBEV_LDFLAGS_32 = -m32 @ENABLE_ALL_IN_ONE_TRUE@@ENABLE_FORCE_32BIT_TRUE@LIBEV_LDFLAGS_32 = -m32
@ENABLE_32BIT_TRUE@@ENABLE_ALL_IN_ONE_TRUE@V8_BUILD_VERSION = ia32 @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_64BIT_TRUE@@ENABLE_ALL_IN_ONE_TRUE@V8_BUILD_VERSION = x64 @ENABLE_ALL_IN_ONE_TRUE@@ENABLE_DARWIN_TRUE@V8_BUILD_VERSION = native
all: $(BUILT_SOURCES) all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am $(MAKE) $(AM_MAKEFLAGS) all-am
@ -2948,9 +2949,7 @@ unittests-http-server:
@ENABLE_ALL_IN_ONE_TRUE@ @echo "--------------------------------------------------------------------------------" @ENABLE_ALL_IN_ONE_TRUE@ @echo "--------------------------------------------------------------------------------"
@ENABLE_ALL_IN_ONE_TRUE@ @echo @ENABLE_ALL_IN_ONE_TRUE@ @echo
@ENABLE_ALL_IN_ONE_TRUE@@ENABLE_DARWIN_TRUE@ cd @top_srcdir@/3rdParty/V8 && scons snapshot=off library=static mode=release arch=$(V8_BUILD_VERSION) @ENABLE_ALL_IN_ONE_TRUE@ cd @top_srcdir@/3rdParty/V8 && make library=static snapshot=off $(V8_BUILD_VERSION).release
@ENABLE_ALL_IN_ONE_TRUE@@ENABLE_DARWIN_TRUE@ cd @top_srcdir@/3rdParty/V8 && mv libv8.a libv8_$(V8_BUILD_VERSION).a
@ENABLE_ALL_IN_ONE_TRUE@@ENABLE_DARWIN_FALSE@ cd @top_srcdir@/3rdParty/V8 && make library=static snapshot=off $(V8_BUILD_VERSION).release
@ENABLE_ALL_IN_ONE_TRUE@ touch .v8-build @ENABLE_ALL_IN_ONE_TRUE@ touch .v8-build

2
configure vendored
View File

@ -8373,7 +8373,7 @@ else
fi fi
fi fi
TRI_V8_VERSION="3.9.4.0" TRI_V8_VERSION="3.10.2"