]>
Commit | Line | Data |
---|---|---|
f852d988 ER |
1 | --- v8-3.6.6.7/SConstruct 2011-11-14 08:19:38.420636802 +0200 |
2 | +++ v8-3.6.6.7/SConstruct 2011-11-14 13:20:28.692835719 +0200 | |
3e994e5b | 3 | @@ -1308,17 +1308,17 @@ |
4 | suffix = SUFFIXES[target_id] | |
14358895 | 5 | library_name = 'v8' + suffix |
6 | preparser_library_name = 'v8preparser' + suffix | |
3e994e5b | 7 | - version = GetVersion() |
14358895 | 8 | - if context.options['soname'] == 'on': |
9 | - # When building shared object with SONAME version the library name. | |
10 | - library_name += '-' + version | |
035f4755 | 11 | + version = '.'.join(GetVersion().split('.')[:2]) |
14358895 | 12 | |
13 | # Generate library SONAME if required by the build. | |
14 | if context.options['soname'] == 'on': | |
15 | soname = GetSpecificSONAME() | |
16 | if soname == '': | |
17 | - soname = 'lib' + library_name + '.so' | |
3e994e5b | 18 | - env['SONAME'] = soname |
14358895 | 19 | + soname = 'lib' + library_name + '.so.' + version |
3e994e5b | 20 | + prepsoname = 'lib' + preparser_library_name + '.so.' + version |
21 | + else: | |
22 | + soname = None | |
23 | + prepsoname = None | |
14358895 | 24 | |
25 | # Build the object files by invoking SCons recursively. | |
3e994e5b | 26 | (object_files, shell_files, mksnapshot, preparser_files) = env.SConscript( |
f852d988 | 27 | @@ -1434,9 +1434,9 @@ |
3e994e5b | 28 | # This should not affect any other platforms. |
29 | pdb_name = library_name + '.dll.pdb' | |
f852d988 | 30 | pdb_name = library_name + '.dll.pdb' |
3e994e5b | 31 | - library = env.SharedLibrary(library_name, object_files, PDB=pdb_name) |
32 | + library = env.SharedLibrary(library_name, object_files, PDB=pdb_name, SONAME=soname) | |
33 | preparser_pdb_name = preparser_library_name + '.dll.pdb'; | |
f852d988 ER |
34 | - preparser_soname = 'lib' + preparser_library_name + '.so'; |
35 | + preparser_soname = 'lib' + preparser_library_name + '.so.' + version; | |
3e994e5b | 36 | preparser_library = env.SharedLibrary(preparser_library_name, |
f852d988 ER |
37 | preparser_files, |
38 | PDB=preparser_pdb_name, |