From 3a6fd65946829d56d96411510466b057428be177 Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Wed, 17 Jan 2018 01:30:25 +0000 Subject: [PATCH] Builds with v8 6.3 on Linux. Also figured out how to go back to v8_snapshot.a. git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3413 ed5197a5-7fde-0310-b194-c3ffbd925b24 --- SConstruct | 4 ++-- tools/update-deps | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/SConstruct b/SConstruct index ee747e0c..5c0449c8 100644 --- a/SConstruct +++ b/SConstruct @@ -5,7 +5,7 @@ import platform import sys options = Variables('options.cache', ARGUMENTS) -options.AddVariables(PathVariable('uv', 'Location of libuv', 'deps/%s/libuv' % sys.platform)) +options.AddVariables(PathVariable('uv', 'Location of libuv', 'deps/%s/uv' % sys.platform)) options.AddVariables(PathVariable('v8', 'Location of v8', 'deps/%s/v8' % sys.platform)) options.AddVariables(PathVariable('lmdb', 'Location of liblmdb', 'deps/%s/lmdb' % sys.platform)) options.AddVariables(BoolVariable('package', 'Build a package', False)) @@ -52,7 +52,7 @@ else: grouped_libs += [env.Library('build/bin/v8_libbase', Glob(os.path.join(v8, 'out', 'obj', 'v8_libbase', '*' + objectSuffix)))] grouped_libs += [env.Library('build/bin/v8_builtins_generators', Glob(os.path.join(v8, 'out', 'obj', 'v8_builtins_generators', '*' + objectSuffix)))] grouped_libs += [env.Library('build/bin/v8_libsampler', Glob(os.path.join(v8, 'out', 'obj', 'v8_libsampler', '*' + objectSuffix)))] - grouped_libs += [env.Library('build/bin/v8_nosnapshot', Glob(os.path.join(v8, 'out', 'obj', 'v8_nosnapshot', '*' + objectSuffix)))] + grouped_libs += [env.Library('build/bin/v8_snapshot', Glob(os.path.join(v8, 'out', 'obj', 'v8_snapshot', '*' + objectSuffix)))] grouped_libs += [env.Library('build/bin/icui18n', Glob(os.path.join(v8, 'out', 'obj', 'third_party', 'icu', 'icui18n', '*' + objectSuffix)))] grouped_libs += [env.Library('build/bin/icuuc', Glob(os.path.join(v8, 'out', 'obj', 'third_party', 'icu', 'icuuc', '*' + objectSuffix)))] grouped_libs += ['-Wl,--end-group'] diff --git a/tools/update-deps b/tools/update-deps index cbb32e35..7e0bbc15 100755 --- a/tools/update-deps +++ b/tools/update-deps @@ -25,7 +25,7 @@ kUvBranch = 'v1.16.1' kUvWork = 'uv' kV8Repository = 'https://github.com/v8/v8.git' -kV8Branch = 'branch-heads/6.2' +kV8Branch = 'branch-heads/6.3' kV8Work = 'v8' kLmdbRepository = 'https://github.com/LMDB/lmdb.git' @@ -150,10 +150,10 @@ def updateV8(): run(['gclient' + extension, 'sync'], cwd=kV8Work) if sys.platform == 'linux2': - run(['gn' + extension, 'gen', 'out', "--args=is_component_build=false v8_static_library=true is_clang=false use_sysroot=false treat_warnings_as_errors=false"], cwd=kV8Work, env=win32Env) + run(['gn' + extension, 'gen', 'out', "--args=is_component_build=false v8_static_library=true v8_use_external_startup_data=false is_clang=false use_sysroot=false treat_warnings_as_errors=false"], cwd=kV8Work, env=win32Env) else: - run(['gn' + extension, 'gen', 'out', "--args=is_component_build=false v8_static_library=true treat_warnings_as_errors=false"], cwd=kV8Work, env=win32Env) - run(['ninja', '-C', 'out'], cwd=kV8Work) + run(['gn' + extension, 'gen', 'out', "--args=is_component_build=false v8_static_library=true v8_use_external_startup_data=false treat_warnings_as_errors=false"], cwd=kV8Work, env=win32Env) + run(['ninja', '-C', 'out', 'v8'], cwd=kV8Work) if __name__ == '__main__': updateUv()