cory/tildefriends
4
5
Fork 1
Code Issues 33 Pull Requests 1 Actions Releases 27 Wiki Activity

Builds with v8 6.3 on Linux. Also figured out how to go back to v8_snapshot.a.

Browse Source 
git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3413 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
Cory McWilliams 2018-01-17 01:30:25 +00:00
parent 2bc62b2ecd
commit 3a6fd65946
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SConstruct
View File

@ -5,7 +5,7 @@ import platform
import sys import sys
options = Variables('options.cache', ARGUMENTS) 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('v8', 'Location of v8', 'deps/%s/v8' % sys.platform))
options.AddVariables(PathVariable('lmdb', 'Location of liblmdb', 'deps/%s/lmdb' % sys.platform)) options.AddVariables(PathVariable('lmdb', 'Location of liblmdb', 'deps/%s/lmdb' % sys.platform))
options.AddVariables(BoolVariable('package', 'Build a package', False)) 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_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_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_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/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 += [env.Library('build/bin/icuuc', Glob(os.path.join(v8, 'out', 'obj', 'third_party', 'icu', 'icuuc', '*' + objectSuffix)))]
grouped_libs += ['-Wl,--end-group'] grouped_libs += ['-Wl,--end-group']

8
tools/update-deps
View File

@ -25,7 +25,7 @@ kUvBranch = 'v1.16.1'
kUvWork = 'uv' kUvWork = 'uv'
kV8Repository = 'https://github.com/v8/v8.git' kV8Repository = 'https://github.com/v8/v8.git'
kV8Branch = 'branch-heads/6.2' kV8Branch = 'branch-heads/6.3'
kV8Work = 'v8' kV8Work = 'v8'
kLmdbRepository = 'https://github.com/LMDB/lmdb.git' kLmdbRepository = 'https://github.com/LMDB/lmdb.git'
@ -150,10 +150,10 @@ def updateV8():
run(['gclient' + extension, 'sync'], cwd=kV8Work) run(['gclient' + extension, 'sync'], cwd=kV8Work)
if sys.platform == 'linux2': 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: 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(['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'], cwd=kV8Work) run(['ninja', '-C', 'out', 'v8'], cwd=kV8Work)
if __name__ == '__main__': if __name__ == '__main__':
updateUv() updateUv()