diff options
author | Pawel Tomulik <ptomulik@meil.pw.edu.pl> | 2015-09-20 19:37:39 (GMT) |
---|---|---|
committer | Pawel Tomulik <ptomulik@meil.pw.edu.pl> | 2015-09-20 19:37:39 (GMT) |
commit | 11711340ea36b162fcef4462f4f01d1d223700cf (patch) | |
tree | 10e32c4e0aa24800a4694f2c5c0bb40fecdbd336 /src | |
parent | ffcb8963212db0e83b79c9cbb584ed6ff3da837a (diff) | |
download | SCons-11711340ea36b162fcef4462f4f01d1d223700cf.zip SCons-11711340ea36b162fcef4462f4f01d1d223700cf.tar.gz SCons-11711340ea36b162fcef4462f4f01d1d223700cf.tar.bz2 |
s/SHLINKSONAME/SHLIBSONAME/
Diffstat (limited to 'src')
-rw-r--r-- | src/engine/SCons/Defaults.py | 1 | ||||
-rw-r--r-- | src/engine/SCons/Tool/cyglink.py | 2 | ||||
-rw-r--r-- | src/engine/SCons/Tool/gdc.py | 2 | ||||
-rw-r--r-- | src/engine/SCons/Tool/gnulink.xml | 2 | ||||
-rw-r--r-- | src/engine/SCons/Tool/link.py | 6 | ||||
-rw-r--r-- | src/engine/SCons/Tool/link.xml | 4 |
6 files changed, 9 insertions, 8 deletions
diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py index c8170c3..744da5f 100644 --- a/src/engine/SCons/Defaults.py +++ b/src/engine/SCons/Defaults.py @@ -512,6 +512,7 @@ ConstructionEnvironment = { '__libversionflags' : __libversionflags, '__SHLIBVERSIONFLAGS' : '${__libversionflags(__env__,"SHLIBVERSION","_SHLIBVERSIONFLAGS")}', '__LDMODULEVERSIONFLAGS' : '${__libversionflags(__env__,"LDMODULEVERSION","_LDMODULEVERSIONFLAGS")}', + '__DSHLIBVERSIONFLAGS' : '${__libversionflags(__env__,"DSHLIBVERSION","_DSHLIBVERSIONFLAGS")}', 'TEMPFILE' : NullCmdGenerator, 'Dir' : Variable_Method_Caller('TARGET', 'Dir'), diff --git a/src/engine/SCons/Tool/cyglink.py b/src/engine/SCons/Tool/cyglink.py index deeb410..5230910 100644 --- a/src/engine/SCons/Tool/cyglink.py +++ b/src/engine/SCons/Tool/cyglink.py @@ -216,7 +216,7 @@ def generate(env): } # these variables were set by gnulink but are not used in cyglink - try: del env['_SHLINKSONAME'] + try: del env['_SHLIBSONAME'] except KeyError: pass try: del env['_LDMODULESONAME'] except KeyError: pass diff --git a/src/engine/SCons/Tool/gdc.py b/src/engine/SCons/Tool/gdc.py index 799c3ab..347efef 100644 --- a/src/engine/SCons/Tool/gdc.py +++ b/src/engine/SCons/Tool/gdc.py @@ -97,7 +97,7 @@ def generate(env): env['DSHLINK'] = '$DC' env['DSHLINKFLAGS'] = SCons.Util.CLVar('$DLINKFLAGS -shared') - env['SHDLINKCOM'] = '$DLINK -o $TARGET $DSHLINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS' + env['SHDLINKCOM'] = '$DLINK -o $TARGET $DSHLINKFLAGS $__DSHLIBVERSIONFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS' env['DLIB'] = 'lib' if env['PLATFORM'] == 'win32' else 'ar cr' env['DLIBCOM'] = '$DLIB $_DLIBFLAGS {0}$TARGET $SOURCES $_DLINKLIBFLAGS'.format('-c ' if env['PLATFORM'] == 'win32' else '') diff --git a/src/engine/SCons/Tool/gnulink.xml b/src/engine/SCons/Tool/gnulink.xml index 63ce0f4..0e055c7 100644 --- a/src/engine/SCons/Tool/gnulink.xml +++ b/src/engine/SCons/Tool/gnulink.xml @@ -34,7 +34,7 @@ Set construction variables for GNU linker/loader. <item>RPATHPREFIX</item> <item>RPATHSUFFIX</item> <item>_LDMODULESONAME</item> -<item>_SHLINKSONAME</item> +<item>_SHLIBSONAME</item> <item>LDMODULEVERSIONFLAGS</item> <item>SHLIBVERSIONFLAGS</item> </sets> diff --git a/src/engine/SCons/Tool/link.py b/src/engine/SCons/Tool/link.py index 6bd36e4..a4a2a4c 100644 --- a/src/engine/SCons/Tool/link.py +++ b/src/engine/SCons/Tool/link.py @@ -256,12 +256,12 @@ def _setup_versioned_lib_variables(env, **kw): if use_soname: # If the linker uses SONAME, then we need this little automata if tool == 'sunlink': - env['_SHLIBVERSIONFLAGS'] = '$SHLIBVERSIONFLAGS -h $_SHLINKSONAME' + env['_SHLIBVERSIONFLAGS'] = '$SHLIBVERSIONFLAGS -h $_SHLIBSONAME' env['_LDMODULEVERSIONFLAGS'] = '$LDMODULEVERSIONFLAGS -h $_LDMODULESONAME' else: - env['_SHLIBVERSIONFLAGS'] = '$SHLIBVERSIONFLAGS -Wl,-soname=$_SHLINKSONAME' + env['_SHLIBVERSIONFLAGS'] = '$SHLIBVERSIONFLAGS -Wl,-soname=$_SHLIBSONAME' env['_LDMODULEVERSIONFLAGS'] = '$LDMODULEVERSIONFLAGS -Wl,-soname=$_LDMODULESONAME' - env['_SHLINKSONAME'] = '${ShLibSonameGenerator(__env__,TARGET)}' + env['_SHLIBSONAME'] = '${ShLibSonameGenerator(__env__,TARGET)}' env['_LDMODULESONAME'] = '${LdModSonameGenerator(__env__,TARGET)}' env['ShLibSonameGenerator'] = SCons.Tool.ShLibSonameGenerator env['LdModSonameGenerator'] = SCons.Tool.LdModSonameGenerator diff --git a/src/engine/SCons/Tool/link.xml b/src/engine/SCons/Tool/link.xml index 52349da..2f913fe 100644 --- a/src/engine/SCons/Tool/link.xml +++ b/src/engine/SCons/Tool/link.xml @@ -107,13 +107,13 @@ This macro automatically introduces extra flags to &cv-link-SHLINKCOM; when building versioned &b-link-SharedLibrary; (that is when &cv-link-SHLIBVERSION; is set). <literal>_SHLIBVERSIONFLAGS</literal> usually adds &cv-link-SHLIBVERSIONFLAGS; and some extra dynamically generated options (such as -<literal>-Wl,-soname=$_SHLINKSONAME</literal>. It is unused by "plain" +<literal>-Wl,-soname=$_SHLIBSONAME</literal>. It is unused by "plain" (unversioned) shared libraries. </para> </summary> </cvar> -<cvar name="_SHLINKSONAME"> +<cvar name="_SHLIBSONAME"> <summary> <para> A macro that automatically generates shared library's SONAME based on $TARGET, |