diff options
| author | Russel Winder <russel@winder.org.uk> | 2017-06-21 08:30:40 (GMT) |
|---|---|---|
| committer | Russel Winder <russel@winder.org.uk> | 2017-06-21 08:30:40 (GMT) |
| commit | dc8c560e937f2497ab8dc8d9bce2e15ad403570e (patch) | |
| tree | 02ce301862fc3b59ceb4f69b39a18433662577cc /src/engine/SCons/Tool/ldc.py | |
| parent | 4967ba7fe355283654561d02417564de82649f7e (diff) | |
| parent | bf8f85b92e290281297d35e3009336cb2135cfe6 (diff) | |
| download | SCons-dc8c560e937f2497ab8dc8d9bce2e15ad403570e.zip SCons-dc8c560e937f2497ab8dc8d9bce2e15ad403570e.tar.gz SCons-dc8c560e937f2497ab8dc8d9bce2e15ad403570e.tar.bz2 | |
Merge in an older commit resolving conflicts.
Diffstat (limited to 'src/engine/SCons/Tool/ldc.py')
| -rw-r--r-- | src/engine/SCons/Tool/ldc.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/engine/SCons/Tool/ldc.py b/src/engine/SCons/Tool/ldc.py index b10bb75..96032b1 100644 --- a/src/engine/SCons/Tool/ldc.py +++ b/src/engine/SCons/Tool/ldc.py @@ -102,8 +102,8 @@ def generate(env): env['DLINKFLAGS'] = SCons.Util.CLVar('') env['DLINKCOM'] = '$DLINK -of=$TARGET $DLINKFLAGS $__DRPATH $SOURCES $_DLIBDIRFLAGS $_DLIBFLAGS' - env['DSHLINK'] = '$DC' - env['DSHLINKFLAGS'] = SCons.Util.CLVar('$DLINKFLAGS -shared -defaultlib=phobos2-ldc') + env['SHDLINK'] = '$DC' + env['SHDLINKFLAGS'] = SCons.Util.CLVar('$DLINKFLAGS -shared -defaultlib=phobos2-ldc') env['SHDLINKCOM'] = '$DLINK -of=$TARGET $DSHLINKFLAGS $__DSHLIBVERSIONFLAGS $__DRPATH $SOURCES $_DLIBDIRFLAGS $_DLIBFLAGS -L-ldruntime-ldc' @@ -131,15 +131,15 @@ def generate(env): env['_DRPATH'] = '${_concat(DRPATHPREFIX, RPATH, DRPATHSUFFIX, __env__)}' # Support for versioned libraries - env['_DSHLIBVERSIONFLAGS'] = '$DSHLIBVERSIONFLAGS -L-soname=$_DSHLIBSONAME' - env['_DSHLIBSONAME'] = '${DShLibSonameGenerator(__env__,TARGET)}' + env['_SHDLIBVERSIONFLAGS'] = '$SHDLIBVERSIONFLAGS -L-soname=$_SHDLIBSONAME' + env['_SHDLIBSONAME'] = '${DShLibSonameGenerator(__env__,TARGET)}' # NOTE: this is a quick hack, the soname will only work if there is # c/c++ linker loaded which provides callback for the ShLibSonameGenerator env['DShLibSonameGenerator'] = SCons.Tool.ShLibSonameGenerator - # NOTE: this is only for further reference, currently $DSHLIBVERSION does + # NOTE: this is only for further reference, currently $SHDLIBVERSION does # not work, the user must use $SHLIBVERSION - env['DSHLIBVERSION'] = '$SHLIBVERSION' - env['DSHLIBVERSIONFLAGS'] = [] + env['SHDLIBVERSION'] = '$SHLIBVERSION' + env['SHDLIBVERSIONFLAGS'] = [] env['BUILDERS']['ProgramAllAtOnce'] = SCons.Builder.Builder( action='$DC $_DINCFLAGS $_DVERFLAGS $_DDEBUGFLAGS $_DFLAGS -of=$TARGET $DLINKFLAGS $__DRPATH $SOURCES $_DLIBDIRFLAGS $_DLIBFLAGS', |