summaryrefslogtreecommitdiff
path: root/engine/SCons/Tool/ldc.py
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2014-09-29 20:22:55 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2014-09-29 20:22:55 +0200
commit0b1559616669d8a8c28dcd78f192c051efec323b (patch)
tree8026a245654dcbaab45384972a02a7166af58db5 /engine/SCons/Tool/ldc.py
parent9ddba95984d3c5bcc02deb636244cac8f1fd686f (diff)
parent665e78e013bc207a5ec35e4bc41daf2e464f6ed3 (diff)
Merge tag 'upstream/2.3.4'
Upstream version 2.3.4
Diffstat (limited to 'engine/SCons/Tool/ldc.py')
-rw-r--r--engine/SCons/Tool/ldc.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/SCons/Tool/ldc.py b/engine/SCons/Tool/ldc.py
index e78cf5a..a32c5ab 100644
--- a/engine/SCons/Tool/ldc.py
+++ b/engine/SCons/Tool/ldc.py
@@ -46,7 +46,7 @@ Lib tool variables:
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/ldc.py 2014/08/24 12:12:31 garyo"
+__revision__ = "src/engine/SCons/Tool/ldc.py 2014/09/27 12:51:43 garyo"
import os
import subprocess
@@ -101,7 +101,7 @@ def generate(env):
env['DLINKCOM'] = '$DLINK -of=$TARGET $DLINKFLAGS $__DRPATH $SOURCES $_DLIBDIRFLAGS $_DLIBFLAGS'
env['DSHLINK'] = '$DC'
- env['DSHLINKFLAGS'] = SCons.Util.CLVar('$DLINKFLAGS -shared')
+ env['DSHLINKFLAGS'] = SCons.Util.CLVar('$DLINKFLAGS -shared -defaultlib=phobos2')
env['SHDLINKCOM'] = '$DLINK -of=$TARGET $DSHLINKFLAGS $__DRPATH $SOURCES $_DLIBDIRFLAGS $_DLIBFLAGS'
env['DLIBLINKPREFIX'] = '' if env['PLATFORM'] == 'win32' else '-L-l'
@@ -126,7 +126,7 @@ def generate(env):
# platform supports it.
env['DRPATHPREFIX'] = '-L-rpath='
env['DRPATHSUFFIX'] = ''
- env['_RPATH'] = '${_concat(DRPATHPREFIX, RPATH, DRPATHSUFFIX, __env__)}'
+ env['_DRPATH'] = '${_concat(DRPATHPREFIX, RPATH, DRPATHSUFFIX, __env__)}'
SCons.Tool.createStaticLibBuilder(env)