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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « gypfiles/toolchain.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2012 the V8 project authors. All rights reserved. 1 # Copyright 2012 the V8 project authors. All rights reserved.
2 # Redistribution and use in source and binary forms, with or without 2 # Redistribution and use in source and binary forms, with or without
3 # modification, are permitted provided that the following conditions are 3 # modification, are permitted provided that the following conditions are
4 # met: 4 # met:
5 # 5 #
6 # * Redistributions of source code must retain the above copyright 6 # * Redistributions of source code must retain the above copyright
7 # notice, this list of conditions and the following disclaimer. 7 # notice, this list of conditions and the following disclaimer.
8 # * Redistributions in binary form must reproduce the above 8 # * Redistributions in binary form must reproduce the above
9 # copyright notice, this list of conditions and the following 9 # copyright notice, this list of conditions and the following
10 # disclaimer in the documentation and/or other materials provided 10 # disclaimer in the documentation and/or other materials provided
(...skipping 13 matching lines...) Expand all
24 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 24 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 25 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
26 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 27
28 { 28 {
29 'variables': { 29 'variables': {
30 'v8_code': 1, 30 'v8_code': 1,
31 # Enable support for Intel VTune. Supported on ia32/x64 only 31 # Enable support for Intel VTune. Supported on ia32/x64 only
32 'v8_enable_vtunejit%': 0, 32 'v8_enable_vtunejit%': 0,
33 'v8_enable_i18n_support%': 1, 33 'v8_enable_i18n_support%': 1,
34 'v8_toolset_for_d8%': 'target',
34 }, 35 },
35 'includes': ['../gypfiles/toolchain.gypi', '../gypfiles/features.gypi'], 36 'includes': ['../gypfiles/toolchain.gypi', '../gypfiles/features.gypi'],
36 'targets': [ 37 'targets': [
37 { 38 {
38 'target_name': 'd8', 39 'target_name': 'd8',
39 'type': 'executable', 40 'type': 'executable',
40 'dependencies': [ 41 'dependencies': [
41 'v8.gyp:v8', 42 'v8.gyp:v8',
42 'v8.gyp:v8_libplatform', 43 'v8.gyp:v8_libplatform',
43 ], 44 ],
44 # Generated source files need this explicitly: 45 # Generated source files need this explicitly:
45 'include_dirs+': [ 46 'include_dirs+': [
46 '..', 47 '..',
47 ], 48 ],
48 'sources': [ 49 'sources': [
49 'd8.h', 50 'd8.h',
50 'd8.cc', 51 'd8.cc',
51 ], 52 ],
52 'conditions': [ 53 'conditions': [
53 [ 'want_separate_host_toolset==1', { 54 [ 'want_separate_host_toolset==1', {
54 'toolsets': [ 'target', ], 55 'toolsets': [ '<(v8_toolset_for_d8)', ],
55 }], 56 }],
56 ['(OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="netbsd" \ 57 ['(OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="netbsd" \
57 or OS=="openbsd" or OS=="solaris" or OS=="android" \ 58 or OS=="openbsd" or OS=="solaris" or OS=="android" \
58 or OS=="qnx" or OS=="aix")', { 59 or OS=="qnx" or OS=="aix")', {
59 'sources': [ 'd8-posix.cc', ] 60 'sources': [ 'd8-posix.cc', ]
60 }], 61 }],
61 [ 'OS=="win"', { 62 [ 'OS=="win"', {
62 'sources': [ 'd8-windows.cc', ] 63 'sources': [ 'd8-windows.cc', ]
63 }], 64 }],
64 [ 'component!="shared_library"', { 65 [ 'component!="shared_library"', {
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 '../tools/js2c.py', 134 '../tools/js2c.py',
134 '<@(_outputs)', 135 '<@(_outputs)',
135 'D8', 136 'D8',
136 '<@(js_files)' 137 '<@(js_files)'
137 ], 138 ],
138 }, 139 },
139 ], 140 ],
140 }, 141 },
141 ], 142 ],
142 'conditions': [ 143 'conditions': [
143 ['test_isolation_mode != "noop"', { 144 ['test_isolation_mode != "noop" and v8_toolset_for_d8 == "target"', {
144 'targets': [ 145 'targets': [
145 { 146 {
146 'target_name': 'd8_run', 147 'target_name': 'd8_run',
147 'type': 'none', 148 'type': 'none',
148 'dependencies': [ 149 'dependencies': [
149 'd8', 150 'd8',
150 ], 151 ],
151 'includes': [ 152 'includes': [
152 '../gypfiles/isolate.gypi', 153 '../gypfiles/isolate.gypi',
153 ], 154 ],
154 'sources': [ 155 'sources': [
155 'd8.isolate', 156 'd8.isolate',
156 ], 157 ],
157 }, 158 },
158 ], 159 ],
159 }], 160 }],
160 ], 161 ],
161 } 162 }
OLDNEW
« 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