diff options
Diffstat (limited to 'deps/v8/tools/gyp/v8.gyp')
-rw-r--r-- | deps/v8/tools/gyp/v8.gyp | 128 |
1 files changed, 68 insertions, 60 deletions
diff --git a/deps/v8/tools/gyp/v8.gyp b/deps/v8/tools/gyp/v8.gyp index 66376c17df..aa01a842f6 100644 --- a/deps/v8/tools/gyp/v8.gyp +++ b/deps/v8/tools/gyp/v8.gyp @@ -129,11 +129,6 @@ ], }, }], - ['v8_enable_i18n_support==1', { - 'sources': [ - '<(SHARED_INTERMEDIATE_DIR)/i18n-libraries.cc', - ], - }], ], 'dependencies': [ 'v8_base.<(v8_target_arch)', @@ -197,11 +192,6 @@ 'V8_SHARED', ], }], - ['v8_enable_i18n_support==1', { - 'sources': [ - '<(SHARED_INTERMEDIATE_DIR)/i18n-libraries.cc', - ], - }], ] }, { @@ -246,7 +236,6 @@ '../../src/checks.cc', '../../src/checks.h', '../../src/circular-queue-inl.h', - '../../src/circular-queue.cc', '../../src/circular-queue.h', '../../src/code-stubs.cc', '../../src/code-stubs.h', @@ -268,6 +257,7 @@ '../../src/cpu-profiler-inl.h', '../../src/cpu-profiler.cc', '../../src/cpu-profiler.h', + '../../src/cpu.cc', '../../src/cpu.h', '../../src/data-flow.cc', '../../src/data-flow.h', @@ -336,6 +326,7 @@ '../../src/heap-snapshot-generator.h', '../../src/heap.cc', '../../src/heap.h', + '../../src/hydrogen-alias-analysis.h', '../../src/hydrogen-bce.cc', '../../src/hydrogen-bce.h', '../../src/hydrogen-bch.cc', @@ -366,6 +357,8 @@ '../../src/hydrogen-mark-deoptimize.h', '../../src/hydrogen-minus-zero.cc', '../../src/hydrogen-minus-zero.h', + '../../src/hydrogen-osr.cc', + '../../src/hydrogen-osr.h', '../../src/hydrogen-range-analysis.cc', '../../src/hydrogen-range-analysis.h', '../../src/hydrogen-redundant-phi.cc', @@ -378,8 +371,8 @@ '../../src/hydrogen-sce.h', '../../src/hydrogen-uint32-analysis.cc', '../../src/hydrogen-uint32-analysis.h', - '../../src/hydrogen-osr.cc', - '../../src/hydrogen-osr.h', + '../../src/i18n.cc', + '../../src/i18n.h', '../../src/icu_util.cc', '../../src/icu_util.h', '../../src/ic-inl.h', @@ -434,8 +427,19 @@ '../../src/optimizing-compiler-thread.cc', '../../src/parser.cc', '../../src/parser.h', + '../../src/platform/elapsed-timer.h', + '../../src/platform/time.cc', + '../../src/platform/time.h', '../../src/platform-posix.h', '../../src/platform.h', + '../../src/platform/condition-variable.cc', + '../../src/platform/condition-variable.h', + '../../src/platform/mutex.cc', + '../../src/platform/mutex.h', + '../../src/platform/semaphore.cc', + '../../src/platform/semaphore.h', + '../../src/platform/socket.cc', + '../../src/platform/socket.h', '../../src/preparse-data-format.h', '../../src/preparse-data.cc', '../../src/preparse-data.h', @@ -514,10 +518,13 @@ '../../src/unicode-inl.h', '../../src/unicode.cc', '../../src/unicode.h', + '../../src/unique.h', '../../src/uri.h', '../../src/utils-inl.h', '../../src/utils.cc', '../../src/utils.h', + '../../src/utils/random-number-generator.cc', + '../../src/utils/random-number-generator.h', '../../src/v8-counters.cc', '../../src/v8-counters.h', '../../src/v8.cc', @@ -686,6 +693,9 @@ ] }], ], + 'libraries': [ + '-lrt' + ] }, 'sources': [ ### gcmole(os:linux) ### '../../src/platform-linux.cc', @@ -698,7 +708,7 @@ 'CAN_USE_VFP_INSTRUCTIONS', ], 'sources': [ - '../../src/platform-posix.cc', + '../../src/platform-posix.cc' ], 'conditions': [ ['host_os=="mac"', { @@ -714,6 +724,28 @@ }], ], }, { + # TODO(bmeurer): What we really want here, is this: + # + # 'link_settings': { + # 'target_conditions': [ + # ['_toolset=="host"', { + # 'libraries': [ + # '-lrt' + # ] + # }] + # ] + # }, + # + # but we can't do this right now, as the AOSP does not support + # linking against the host librt, so we need to work around this + # for now, using the following hack (see platform/time.cc): + 'target_conditions': [ + ['_toolset=="host"', { + 'defines': [ + 'V8_LIBRT_NOT_AVAILABLE=1', + ], + }], + ], 'sources': [ '../../src/platform-linux.cc' ] @@ -761,7 +793,7 @@ ]}, 'sources': [ '../../src/platform-solaris.cc', - '../../src/platform-posix.cc', + '../../src/platform-posix.cc' ], } ], @@ -784,13 +816,13 @@ ['build_env=="Cygwin"', { 'sources': [ '../../src/platform-cygwin.cc', - '../../src/platform-posix.cc', + '../../src/platform-posix.cc' ], }, { 'sources': [ '../../src/platform-win32.cc', - '../../src/win32-math.h', '../../src/win32-math.cc', + '../../src/win32-math.h' ], }], ], @@ -800,8 +832,8 @@ }, { 'sources': [ '../../src/platform-win32.cc', - '../../src/win32-math.h', '../../src/win32-math.cc', + '../../src/win32-math.h' ], 'msvs_disabled_warnings': [4351, 4355, 4800], 'link_settings': { @@ -822,20 +854,15 @@ ] }], ['v8_enable_i18n_support==1', { - 'sources': [ - '../../src/i18n.cc', - '../../src/i18n.h', - '../../src/extensions/i18n/break-iterator.cc', - '../../src/extensions/i18n/break-iterator.h', - '../../src/extensions/i18n/i18n-extension.cc', - '../../src/extensions/i18n/i18n-extension.h', - '../../src/extensions/i18n/i18n-utils.cc', - '../../src/extensions/i18n/i18n-utils.h', - ], 'dependencies': [ '<(DEPTH)/third_party/icu/icu.gyp:icui18n', '<(DEPTH)/third_party/icu/icu.gyp:icuuc', ] + }, { # v8_enable_i18n_support==0 + 'sources!': [ + '../../src/i18n.cc', + '../../src/i18n.h', + ], }], ['OS=="win" and v8_enable_i18n_support==1', { 'dependencies': [ @@ -854,24 +881,15 @@ 'toolsets': ['target'], }], ['v8_enable_i18n_support==1', { - 'actions': [{ - 'action_name': 'js2c_i18n', - 'inputs': [ - '../../tools/js2c.py', - '<@(i18n_library_files)', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/i18n-libraries.cc', - ], - 'action': [ - 'python', - '../../tools/js2c.py', - '<@(_outputs)', - 'I18N', - '<(v8_compress_startup_data)', - '<@(i18n_library_files)' + 'variables': { + 'i18n_library_files': [ + '../../src/i18n.js', ], - }], + }, + }, { + 'variables': { + 'i18n_library_files': [], + }, }], ], 'variables': { @@ -890,6 +908,8 @@ '../../src/date.js', '../../src/json.js', '../../src/regexp.js', + '../../src/arraybuffer.js', + '../../src/typedarray.js', '../../src/macros.py', ], 'experimental_library_files': [ @@ -898,25 +918,11 @@ '../../src/proxy.js', '../../src/collection.js', '../../src/object-observe.js', - '../../src/arraybuffer.js', - '../../src/typedarray.js', '../../src/generator.js', '../../src/array-iterator.js', '../../src/harmony-string.js', '../../src/harmony-array.js', ], - 'i18n_library_files': [ - '../../src/extensions/i18n/header.js', - '../../src/extensions/i18n/globals.js', - '../../src/extensions/i18n/locale.js', - '../../src/extensions/i18n/collator.js', - '../../src/extensions/i18n/number-format.js', - '../../src/extensions/i18n/date-format.js', - '../../src/extensions/i18n/break-iterator.js', - '../../src/extensions/i18n/i18n-utils.js', - '../../src/extensions/i18n/overrides.js', - '../../src/extensions/i18n/footer.js', - ], }, 'actions': [ { @@ -924,6 +930,7 @@ 'inputs': [ '../../tools/js2c.py', '<@(library_files)', + '<@(i18n_library_files)', ], 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/libraries.cc', @@ -934,7 +941,8 @@ '<@(_outputs)', 'CORE', '<(v8_compress_startup_data)', - '<@(library_files)' + '<@(library_files)', + '<@(i18n_library_files)', ], }, { |