r23681 - in /branches/frame_order_cleanup: ./ sconstruct -- June 06, 2014 - 09:54

Author: bugman
Date: Fri Jun  6 09:54:46 2014
New Revision: 23681

URL: http://svn.gna.org/viewcvs/relax?rev=23681&view=rev
Log:
Merged revisions 23675 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r23675 | bugman | 2014-06-06 09:30:52 +0200 (Fri, 06 Jun 2014) | 10 lines
  
  Bug fix for r23674, the compilation of the C modules now respects the user 
defined environment.
  
  This is the patch from Justin (https://gna.org/users/jlec) attached to bug 
#22145
  (https://gna.org/bugs/?22145).
  
  The problem was that on Mac OS X (as well as other systems), that these 
environmental variables were
  not defined and hence the scons commands would all fail with a KeyError and 
traceback.  Now the keys
  in the os.environ dictionary are being searched for before they are set.
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/sconstruct

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jun  6 09:54:46 2014
@@ -1 +1 @@
-/trunk:1-23647,23651-23667,23674
+/trunk:1-23647,23651-23667,23674-23675

Modified: branches/frame_order_cleanup/sconstruct
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/sconstruct?rev=23681&r1=23680&r2=23681&view=diff
==============================================================================
--- branches/frame_order_cleanup/sconstruct     (original)
+++ branches/frame_order_cleanup/sconstruct     Fri Jun  6 09:54:46 2014
@@ -631,9 +631,13 @@
             nodes.append(env.SharedObject(dir + path.sep + file, 
CCFLAGS=cflags))
 
         # Respect the user environment, specifically compiler, compiler- and 
linkerflags.
-        env.Append(LINKFLAGS = environ['LDFLAGS'])
-        env.Append(CFLAGS = environ['CFLAGS'])
-        env.Replace(CC = environ['CC'])
+        print environ
+        if 'LDFLAGS' in environ:
+            env.Append(LINKFLAGS = environ['LDFLAGS'])
+        if 'CFLAGS' in environ:
+            env.Append(CFLAGS = environ['CFLAGS'])
+        if 'CC' in environ:
+            env.Replace(CC = environ['CC'])
 
         # Build the relaxation curve fitting module.
         self.relax_fit_object = env.SharedLibrary(target=dir + path.sep + 
'relax_fit', source=nodes, SHLIBPREFIX=prefix, SHLIBSUFFIX=suffix)