[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50102] trunk/blender/build_files/scons/ tools/Blender.py: For gcc based systems use g++ for linking.

Antony Riakiotakis kalast at gmail.com
Tue Aug 21 23:01:07 CEST 2012


Revision: 50102
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50102
Author:   psy-fi
Date:     2012-08-21 21:01:07 +0000 (Tue, 21 Aug 2012)
Log Message:
-----------
For gcc based systems use g++ for linking. This is necessary so that exceptions are propagated between shared libraries. We already use g++ when linking with cmake.

This solves crash when trying to render with missing files on MinGW-w64 cycles. The cause was an OpenEXR exception that went uncaught when trying to check the file's extension through OpenImageIO while building the shader tree. Thus my bug-hunting frustration can end with a happy chord.

Modified Paths:
--------------
    trunk/blender/build_files/scons/tools/Blender.py

Modified: trunk/blender/build_files/scons/tools/Blender.py
===================================================================
--- trunk/blender/build_files/scons/tools/Blender.py	2012-08-21 20:34:07 UTC (rev 50101)
+++ trunk/blender/build_files/scons/tools/Blender.py	2012-08-21 21:01:07 UTC (rev 50102)
@@ -845,6 +845,8 @@
         print bc.HEADER+'Configuring program '+bc.ENDC+bc.OKGREEN+progname+bc.ENDC
         lenv = self.Clone()
         lenv.Append(LINKFLAGS = lenv['PLATFORM_LINKFLAGS'])
+        if lenv['OURPLATFORM'] in ('win32-mingw', 'win64-mingw', 'linuxcross', 'cygwin', 'linux'):
+            lenv.Replace(LINK = '$CXX')
         if lenv['OURPLATFORM'] in ('win32-vc', 'cygwin', 'win64-vc'):
             if lenv['BF_DEBUG']:
                 lenv.Prepend(LINKFLAGS = ['/DEBUG','/PDB:'+progname+'.pdb','/NODEFAULTLIB:libcmt'])




More information about the Bf-blender-cvs mailing list