Use the upstream V8 repo rather than v8-native-prototype.
Fixes #12
diff --git a/.gitignore b/.gitignore
index 0a6396f..4d06b80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,10 @@
+/third_party/depot_tools
/third_party/llvm
+
+# Directory owned by gclient.
+/third_party/v8
+# The actual submodule.
+!/third_party/v8/v8
+
+# Emacs
+*~
diff --git a/.gitmodules b/.gitmodules
index 188061f..49bf528 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,6 @@
[submodule "third_party/sexpr-wasm-prototype"]
path = third_party/sexpr-wasm-prototype
url = https://github.com/webassembly/sexpr-wasm-prototype
-[submodule "third_party/v8-native-prototype"]
- path = third_party/v8-native-prototype
- url = https://github.com/webassembly/v8-native-prototype
+[submodule "third_party/v8/v8"]
+ path = third_party/v8/v8
+ url = https://chromium.googlesource.com/v8/v8.git
diff --git a/bin/d8 b/bin/d8
index 1a5a6e2..825212f 120000
--- a/bin/d8
+++ b/bin/d8
@@ -1 +1 @@
-../third_party/v8-native-prototype/v8/v8/out/Release/d8
\ No newline at end of file
+../third_party/v8/v8/out/Release/d8
\ No newline at end of file
diff --git a/bin/natives_blob.bin b/bin/natives_blob.bin
index 02c5a08..1ec3e2d 120000
--- a/bin/natives_blob.bin
+++ b/bin/natives_blob.bin
@@ -1 +1 @@
-../third_party/v8-native-prototype/v8/v8/out/Release/natives_blob.bin
\ No newline at end of file
+../third_party/v8/v8/out/Release/natives_blob.bin
\ No newline at end of file
diff --git a/bin/snapshot_blob.bin b/bin/snapshot_blob.bin
index 35b0bf8..6858726 120000
--- a/bin/snapshot_blob.bin
+++ b/bin/snapshot_blob.bin
@@ -1 +1 @@
-../third_party/v8-native-prototype/v8/v8/out/Release/snapshot_blob.bin
\ No newline at end of file
+../third_party/v8/v8/out/Release/snapshot_blob.bin
\ No newline at end of file
diff --git a/scripts/build-d8.sh b/scripts/build-d8.sh
index bab014f..b5686b9 100755
--- a/scripts/build-d8.sh
+++ b/scripts/build-d8.sh
@@ -24,7 +24,7 @@
SCRIPT_DIR="$(dirname "$0")"
ROOT_DIR="$(dirname "${SCRIPT_DIR}")"
-cd ${ROOT_DIR}/third_party/v8-native-prototype
+cd ${ROOT_DIR}/third_party
# copied from v8-native-prototype/install-dependencies.sh, but this fetches a
# shallow clone.
@@ -35,29 +35,20 @@
export PATH=$PWD/depot_tools:$PATH
-if [[ ${sync} = "YES" ]]; then
- if [[ ! -d v8 ]]; then
- echo "Fetching v8"
- mkdir v8
- pushd v8
- fetch --no-history v8
- ln -fs $PWD/.. v8/third_party/wasm
- popd
- else
- pushd v8/v8
- git fetch origin
- git checkout origin/master
- popd
- fi
+cd v8
- pushd v8
+# Create a .gclient file if it doesn't exist.
+if [[ ! -e .gclient ]]; then
+ gclient config --unmanaged `cd v8; git config --get remote.origin.url`
+fi
+
+if [[ ${sync} = "YES" ]]; then
gclient update
- popd
fi
# Don't use the CC from the environment; v8 doesn't seem to build properly with
# it.
unset CC
-cd v8/v8
+cd v8
GYP_GENERATORS=ninja build/gyp_v8 -Dv8_wasm=1 -Dwerror=
time ninja -C out/${config} d8
diff --git a/third_party/v8-native-prototype b/third_party/v8-native-prototype
deleted file mode 160000
index f45b703..0000000
--- a/third_party/v8-native-prototype
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f45b703c983a850e66d1cab61ba83d63014d91c9
diff --git a/third_party/v8/v8 b/third_party/v8/v8
new file mode 160000
index 0000000..3b52a53
--- /dev/null
+++ b/third_party/v8/v8
@@ -0,0 +1 @@
+Subproject commit 3b52a537736d0a94237b2022861bbf5180239a5c