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

Side by Side Diff: test/unittests/unittests.gyp

Issue 794213002: Fix builds w/ component=="shared_library" and v8_use_external_startup_data==1. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 6 years 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 | « test/cctest/cctest.gyp ('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 2014 the V8 project authors. All rights reserved. 1 # Copyright 2014 the V8 project authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'v8_code': 1, 7 'v8_code': 1,
8 }, 8 },
9 'includes': ['../../build/toolchain.gypi', '../../build/features.gypi'], 9 'includes': ['../../build/toolchain.gypi', '../../build/features.gypi'],
10 'targets': [ 10 'targets': [
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 }], 99 }],
100 ['v8_target_arch=="x64"', { 100 ['v8_target_arch=="x64"', {
101 'sources': [ ### gcmole(arch:x64) ### 101 'sources': [ ### gcmole(arch:x64) ###
102 'compiler/x64/instruction-selector-x64-unittest.cc', 102 'compiler/x64/instruction-selector-x64-unittest.cc',
103 ], 103 ],
104 }], 104 }],
105 ['component=="shared_library"', { 105 ['component=="shared_library"', {
106 # compiler-unittests can't be built against a shared library, so we 106 # compiler-unittests can't be built against a shared library, so we
107 # need to depend on the underlying static target in that case. 107 # need to depend on the underlying static target in that case.
108 'conditions': [ 108 'conditions': [
109 ['v8_use_snapshot=="true"', { 109 ['v8_use_snapshot=="true" and v8_use_external_startup_data==0', {
110 'dependencies': ['../../tools/gyp/v8.gyp:v8_snapshot'], 110 'dependencies': ['../../tools/gyp/v8.gyp:v8_snapshot'],
111 }, 111 }],
112 { 112 ['v8_use_snapshot=="true" and v8_use_external_startup_data==1', {
113 'dependencies': [ 113 'dependencies': ['../../tools/gyp/v8.gyp:v8_external_snapshot'],
114 '../../tools/gyp/v8.gyp:v8_nosnapshot', 114 }],
115 ], 115 ['v8_use_snapshot!="true"', {
116 'dependencies': ['../../tools/gyp/v8.gyp:v8_nosnapshot'],
116 }], 117 }],
117 ], 118 ],
118 }, { 119 }, {
119 'dependencies': ['../../tools/gyp/v8.gyp:v8'], 120 'dependencies': ['../../tools/gyp/v8.gyp:v8'],
120 }], 121 }],
121 ['os_posix == 1', { 122 ['os_posix == 1', {
122 # TODO(svenpanne): This is a temporary work-around to fix the warnings 123 # TODO(svenpanne): This is a temporary work-around to fix the warnings
123 # that show up because we use -std=gnu++0x instead of -std=c++11. 124 # that show up because we use -std=gnu++0x instead of -std=c++11.
124 'cflags!': [ 125 'cflags!': [
125 '-pedantic', 126 '-pedantic',
126 ], 127 ],
127 'direct_dependent_settings': { 128 'direct_dependent_settings': {
128 'cflags!': [ 129 'cflags!': [
129 '-pedantic', 130 '-pedantic',
130 ], 131 ],
131 }, 132 },
132 }], 133 }],
133 ], 134 ],
134 }, 135 },
135 ], 136 ],
136 } 137 }
OLDNEW
« no previous file with comments | « test/cctest/cctest.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698