use upstream v8 instead of v8-native-prototype

2 files changed, 6 insertions, 33 deletions

diff --git a/scripts/build-d8.sh b/scripts/build-d8.sh
index e6fa9c09..13b043d9 100755
--- a/scripts/build-d8.sh
+++ b/scripts/build-d8.sh
@@ -2,17 +2,11 @@
 set -o nounset
 set -o errexit
 
-V8_REV=e8adbe7821be5be02ef187912a74dde1152eefb1
-
-sync=YES
 config=Release
 
 while [[ $# > 0 ]]; do
   flag="$1"
   case $flag in
-    --no-sync)
-      sync=NO
-      ;;
     --debug)
       config=Debug
       ;;
@@ -26,40 +20,19 @@ done
 SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
 ROOT_DIR="$(dirname "${SCRIPT_DIR}")"
 
-cd ${ROOT_DIR}/third_party/v8-native-prototype
+cd ${ROOT_DIR}/third_party/v8
 
-# copied from v8-native-prototype/install-dependencies.sh, but this fetches a
-# shallow clone.
 if [[ ! -d depot_tools ]]; then
   echo "Cloning depot_tools"
   git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
 fi
 
 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
-
-  pushd v8
-  gclient update --revision=${V8_REV}
-  popd
-fi
+gclient sync
 
 # Don't use the CC from the environment; v8 doesn't seem to build properly with
 # it.
 unset CC
-cd v8/v8
-GYP_GENERATORS=ninja build/gyp_v8 -Dv8_wasm=1 -Dwerror=
+cd v8
+GYP_GENERATORS=ninja build/gyp_v8 -Dv8_wasm=1
 time ninja -C out/${config} d8
diff --git a/scripts/upload-d8.sh b/scripts/upload-d8.sh
index 937d6f5a..6d1b5efb 100755
--- a/scripts/upload-d8.sh
+++ b/scripts/upload-d8.sh
@@ -4,8 +4,8 @@ set -o errexit
 
 SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
 ROOT_DIR="$(dirname "${SCRIPT_DIR}")"
-V8_DIR="${ROOT_DIR}/third_party/v8-native-prototype"
-V8_OUT_DIR="${V8_DIR}/v8/v8/out/Release"
+V8_DIR="${ROOT_DIR}/third_party/v8/v8"
+V8_OUT_DIR="${V8_DIR}/out/Release"
 
 V8_SHA=$(cd ${V8_DIR} && git rev-parse HEAD)
 BUCKET_URL=gs://webassembly/v8-native-prototype/${V8_SHA}/