Skip to content

Commit

Permalink
Merge branch 'v8_4.2' of github.com:arangodb/arangodb into devel
Browse files Browse the repository at this point in the history
  • Loading branch information
dothebart committed Jun 18, 2015
2 parents cecf0ce + 3560046 commit a280ef7
Show file tree
Hide file tree
Showing 23,113 changed files with 673,107 additions and 66,032 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 2 additions & 1 deletion 3rdParty/Makefile.v8
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ BUILT_SOURCES += @V8_LIBS@
DEBUG_V8_FLAGS = -DV8_TARGET_ARCH_X64 -DENABLE_GDB_JIT_INTERFACE -DV8_DEPRECATION_WARNINGS -DV8_I18N_SUPPORT -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 -DUNIT_TEST -DGTEST_HAS_RTTI=0 -DENABLE_DISASSEMBLER -DV8_ENABLE_CHECKS -DOBJECT_PRINT -DVERIFY_HEAP -DDEBUG -DENABLE_EXTRA_CHECKS -DENABLE_HANDLE_ZAPPING -DOPTIMIZED_DEBUG

if ENABLE_GOLD
GOLD_V8_FLAGS = -fuse-ld=gold
GOLD_V8_FLAGS =
# -fuse-ld=gold
else
GOLD_V8_FLAGS =
endif
Expand Down
8 changes: 4 additions & 4 deletions 3rdParty/Makefile.v8-arm
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ install:
mkdir -p ../ArmLibraries/lib
mkdir -p ../ArmLibraries/include/unicode

cp -a V8-3.31.74.1/out/arm.release/obj.target/tools/gyp/*.a ../ArmLibraries/lib
cp -a V8-3.31.74.1/out/arm.release/obj.target/third_party/icu/*.a ../ArmLibraries/lib
cp -a V8-3.31.74.1/include/* ../ArmLibraries/include
cp -a V8-4.2.77.1/out/arm.release/obj.target/tools/gyp/*.a ../ArmLibraries/lib
cp -a V8-4.2.77.1/out/arm.release/obj.target/third_party/icu/*.a ../ArmLibraries/lib
cp -a V8-4.2.77.1/include/* ../ArmLibraries/include

for f in common i18n io; do \
cp -a V8-3.31.74.1/third_party/icu/source/$${f}/unicode/* ../ArmLibraries/include/unicode/; \
cp -a V8-4.2.77.1/third_party/icu/source/$${f}/unicode/* ../ArmLibraries/include/unicode/; \
done
4 changes: 2 additions & 2 deletions 3rdParty/Makefile.v8-windows
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

V8=V8-3.31.74.1
V8=V8-4.2.77.1

.PHONY: all install

Expand Down Expand Up @@ -45,5 +45,5 @@ install_bits:
cp $(V8)/third_party/icu/source/data/in/icudtl.dat ../WindowsLibraries/$(BITS)/icudtl.dat

for f in common i18n io; do \
cp -a V8-3.31.74.1/third_party/icu/source/$${f}/unicode/* ../WindowsLibraries/$(BITS)/include/unicode/; \
cp -a V8-4.2.77.1/third_party/icu/source/$${f}/unicode/* ../WindowsLibraries/$(BITS)/include/unicode/; \
done
79 changes: 0 additions & 79 deletions 3rdParty/V8-3.31.74.1/AUTHORS

This file was deleted.

95 changes: 0 additions & 95 deletions 3rdParty/V8-3.31.74.1/DEPS

This file was deleted.

Loading

0 comments on commit a280ef7

Please sign in to comment.