Commit 6cb38427 authored by jochen's avatar jochen Committed by Commit bot

Remove v8_toolset_for_d8 flag

R=machenbach@chromium.org
BUG=chromium:609107

Review-Url: https://codereview.chromium.org/1969793002
Cr-Commit-Position: refs/heads/master@{#36198}
parent d748daa3
......@@ -64,7 +64,6 @@ declare_args() {
}
v8_random_seed = "314159265"
v8_toolset_for_d8 = "host"
v8_toolset_for_shell = "host"
if (is_msan) {
......@@ -2066,10 +2065,7 @@ if (is_component_build) {
}
}
if ((current_toolchain == host_toolchain && v8_toolset_for_d8 == "host") ||
(current_toolchain == snapshot_toolchain && v8_toolset_for_d8 == "host") ||
(current_toolchain != host_toolchain && v8_toolset_for_d8 == "target")) {
executable("d8") {
executable("d8") {
sources = [
"src/d8.cc",
"src/d8.h",
......@@ -2108,7 +2104,6 @@ if ((current_toolchain == host_toolchain && v8_toolset_for_d8 == "host") ||
if (v8_enable_i18n_support) {
deps += [ "//third_party/icu" ]
}
}
}
if ((current_toolchain == host_toolchain && v8_toolset_for_shell == "host") || (current_toolchain == snapshot_toolchain && v8_toolset_for_shell == "host") || (current_toolchain != host_toolchain && v8_toolset_for_shell == "target")) {
......
......@@ -76,11 +76,6 @@
# it's handled in gypfiles/standalone.gypi.
'want_separate_host_toolset%': 1,
# Toolset the d8 binary should be compiled for. Possible values are 'host'
# and 'target'. If you want to run v8 tests, it needs to be set to 'target'.
# The setting is ignored if want_separate_host_toolset is 0.
'v8_toolset_for_d8%': 'target',
# Toolset the shell binary should be compiled for. Possible values are
# 'host' and 'target'.
# The setting is ignored if want_separate_host_toolset is 0.
......
......@@ -31,7 +31,6 @@
# Enable support for Intel VTune. Supported on ia32/x64 only
'v8_enable_vtunejit%': 0,
'v8_enable_i18n_support%': 1,
'v8_toolset_for_d8%': 'target',
},
'includes': ['../gypfiles/toolchain.gypi', '../gypfiles/features.gypi'],
'targets': [
......@@ -52,7 +51,7 @@
],
'conditions': [
[ 'want_separate_host_toolset==1', {
'toolsets': [ '<(v8_toolset_for_d8)', ],
'toolsets': [ 'target', ],
}],
['(OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="netbsd" \
or OS=="openbsd" or OS=="solaris" or OS=="android" \
......@@ -141,7 +140,7 @@
},
],
'conditions': [
['test_isolation_mode != "noop" and v8_toolset_for_d8 == "target"', {
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'd8_run',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment