--- v8/snapshot_toolchain.gni.orig	2015-11-12 15:24:59.332391956 +0000
+++ v8/snapshot_toolchain.gni	2015-11-12 15:25:23.280889700 +0000
@@ -28,19 +28,4 @@
 # The snapshot needs to be compiled for the host, but compiled with
 # a toolchain that matches the bit-width of the target.
 
-# TODO(GYP): For now we only support 32-bit little-endian target builds from an
-# x64 Linux host. Eventually we need to support all of the host/target
-# configurations v8 runs on.
-if (host_cpu == "x64" && host_os == "linux") {
-  if (target_cpu == "arm" || target_cpu == "mipsel" || target_cpu == "x86") {
-    snapshot_toolchain = "//build/toolchain/linux:clang_x86"
-  } else if (target_cpu == "x64") {
-    snapshot_toolchain = "//build/toolchain/linux:clang_x64"
-  } else {
-    assert(false, "Need environment for this arch")
-  }
-} else {
-  snapshot_toolchain = default_toolchain
-}
-
-
+snapshot_toolchain = default_toolchain