|
6 | 6 | 'node_use_etw%': 'false',
|
7 | 7 | 'node_use_perfctr%': 'false',
|
8 | 8 | 'node_has_winsdk%': 'false',
|
9 |
| - 'node_shared_v8%': 'false', |
10 | 9 | 'node_shared_zlib%': 'false',
|
11 | 10 | 'node_shared_http_parser%': 'false',
|
12 | 11 | 'node_shared_libuv%': 'false',
|
|
81 | 80 |
|
82 | 81 | 'dependencies': [
|
83 | 82 | 'node_js2c#host',
|
84 |
| - 'deps/cares/cares.gyp:cares' |
| 83 | + 'deps/cares/cares.gyp:cares', |
| 84 | + 'deps/v8/tools/gyp/v8.gyp:v8', |
| 85 | + 'deps/v8/tools/gyp/v8.gyp:v8_libplatform' |
85 | 86 | ],
|
86 | 87 |
|
87 | 88 | 'include_dirs': [
|
88 | 89 | 'src',
|
89 | 90 | 'tools/msvs/genfiles',
|
90 | 91 | 'deps/uv/src/ares',
|
91 |
| - '<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h |
| 92 | + '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h |
| 93 | + 'deps/v8' # include/v8_platform.h |
92 | 94 | ],
|
93 | 95 |
|
94 | 96 | 'sources': [
|
|
163 | 165 | 'src/util-inl.h',
|
164 | 166 | 'src/util.cc',
|
165 | 167 | 'deps/http_parser/http_parser.h',
|
| 168 | + 'deps/v8/include/v8.h', |
| 169 | + 'deps/v8/include/v8-debug.h', |
166 | 170 | '<(SHARED_INTERMEDIATE_DIR)/node_natives.h',
|
167 | 171 | # javascript files to make for an even more pleasant IDE experience
|
168 | 172 | '<@(library_files)',
|
|
306 | 310 | ],
|
307 | 311 | },
|
308 | 312 | }],
|
309 |
| - [ 'node_shared_v8=="false"', { |
310 |
| - 'sources': [ |
311 |
| - 'deps/v8/include/v8.h', |
312 |
| - 'deps/v8/include/v8-debug.h', |
313 |
| - ], |
314 |
| - 'dependencies': [ |
315 |
| - 'deps/v8/tools/gyp/v8.gyp:v8', |
316 |
| - 'deps/v8/tools/gyp/v8.gyp:v8_libplatform', |
317 |
| - ], |
318 |
| - # libplatform/libplatform.h includes include/v8platform.h |
319 |
| - 'include_dirs': [ 'deps/v8' ], |
320 |
| - }], |
321 |
| - |
322 | 313 | [ 'node_shared_zlib=="false"', {
|
323 | 314 | 'dependencies': [ 'deps/zlib/zlib.gyp:zlib' ],
|
324 | 315 | }],
|
|
381 | 372 | ],
|
382 | 373 | }],
|
383 | 374 | [ 'OS=="freebsd" or OS=="linux"', {
|
384 |
| - 'ldflags': [ '-Wl,-z,noexecstack' ], |
| 375 | + 'ldflags': [ '-Wl,-z,noexecstack', |
| 376 | + '-Wl,--whole-archive <(V8_BASE)', |
| 377 | + '-Wl,--no-whole-archive' ] |
385 | 378 | }],
|
386 | 379 | [ 'OS=="sunos"', {
|
387 | 380 | 'ldflags': [ '-Wl,-M,/usr/lib/ld/map.noexstk' ],
|
388 | 381 | }],
|
389 |
| - [ |
390 |
| - 'OS in "linux freebsd" and node_shared_v8=="false"', { |
391 |
| - 'ldflags': [ |
392 |
| - '-Wl,--whole-archive <(V8_BASE) -Wl,--no-whole-archive', |
393 |
| - ], |
394 |
| - }], |
395 | 382 | ],
|
396 | 383 | 'msvs_settings': {
|
397 | 384 | 'VCManifestTool': {
|
|
619 | 606 | {
|
620 | 607 | 'target_name': 'cctest',
|
621 | 608 | 'type': 'executable',
|
622 |
| - 'dependencies': [ 'deps/gtest/gtest.gyp:gtest' ], |
623 |
| - 'conditions': [ |
624 |
| - [ 'node_shared_v8=="false"', { |
625 |
| - 'dependencies': [ 'deps/v8/tools/gyp/v8.gyp:v8' ], |
626 |
| - }], |
| 609 | + 'dependencies': [ |
| 610 | + 'deps/gtest/gtest.gyp:gtest', |
| 611 | + 'deps/v8/tools/gyp/v8.gyp:v8', |
| 612 | + 'deps/v8/tools/gyp/v8.gyp:v8_libplatform' |
627 | 613 | ],
|
628 | 614 | 'include_dirs': [
|
629 | 615 | 'src',
|
| 616 | + 'deps/v8/include' |
630 | 617 | ],
|
631 | 618 | 'defines': [
|
632 | 619 | # gtest's ASSERT macros conflict with our own.
|
|
0 commit comments