diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-09-29 20:22:55 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-09-29 20:22:55 +0200 |
| commit | 0b1559616669d8a8c28dcd78f192c051efec323b (patch) | |
| tree | 8026a245654dcbaab45384972a02a7166af58db5 /engine/SCons/Tool/gdc.py | |
| parent | 9ddba95984d3c5bcc02deb636244cac8f1fd686f (diff) | |
| parent | 665e78e013bc207a5ec35e4bc41daf2e464f6ed3 (diff) | |
Merge tag 'upstream/2.3.4'
Upstream version 2.3.4
Diffstat (limited to 'engine/SCons/Tool/gdc.py')
| -rw-r--r-- | engine/SCons/Tool/gdc.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/SCons/Tool/gdc.py b/engine/SCons/Tool/gdc.py index c09514a..52bfb9b 100644 --- a/engine/SCons/Tool/gdc.py +++ b/engine/SCons/Tool/gdc.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/gdc.py 2014/08/24 12:12:31 garyo" +__revision__ = "src/engine/SCons/Tool/gdc.py 2014/09/27 12:51:43 garyo" import SCons.Action import SCons.Defaults @@ -95,9 +95,9 @@ def generate(env): env['DLINKFLAGS'] = SCons.Util.CLVar('') env['DLINKCOM'] = '$DLINK -o $TARGET $DLINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS' - env['SHDLINK'] = '$DC' - env['SHDLINKFLAGS'] = SCons.Util.CLVar('$DLINKFLAGS -shared') - env['SHDLINKCOM'] = '$DLINK -o $TARGET $DLINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS' + env['DSHLINK'] = '$DC' + env['DSHLINKFLAGS'] = SCons.Util.CLVar('$DLINKFLAGS -shared') + env['SHDLINKCOM'] = '$DLINK -o $TARGET $DSHLINKFLAGS $__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 '') |