Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(132)

Unified Diff: src/d8.gyp

Issue 1974773002: Revert of Remove v8_toolset_for_d8 flag (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Now without conflicts Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gypfiles/toolchain.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/d8.gyp
diff --git a/src/d8.gyp b/src/d8.gyp
index e60b01f8c847145c9c8c4d4875eb654151dace60..f328616238e8f2755a4b58f9a1466cea0a7174d3 100644
--- a/src/d8.gyp
+++ b/src/d8.gyp
@@ -31,6 +31,7 @@
# 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': [
@@ -51,7 +52,7 @@
],
'conditions': [
[ 'want_separate_host_toolset==1', {
- 'toolsets': [ 'target', ],
+ 'toolsets': [ '<(v8_toolset_for_d8)', ],
}],
['(OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="netbsd" \
or OS=="openbsd" or OS=="solaris" or OS=="android" \
@@ -140,7 +141,7 @@
},
],
'conditions': [
- ['test_isolation_mode != "noop"', {
+ ['test_isolation_mode != "noop" and v8_toolset_for_d8 == "target"', {
'targets': [
{
'target_name': 'd8_run',
« no previous file with comments | « gypfiles/toolchain.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698