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

Author: bugman
Date: Fri Jun  6 09:54:08 2014
New Revision: 23680

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

........
  r23674 | bugman | 2014-06-06 09:15:26 +0200 (Fri, 06 Jun 2014) | 7 lines
  
  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).  It has been modified to include a comment 
and remove a double empty
  line.
........

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:08 2014
@@ -1 +1 @@
-/trunk:1-23647,23651-23667
+/trunk:1-23647,23651-23667,23674

Modified: branches/frame_order_cleanup/sconstruct
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/sconstruct?rev=23680&r1=23679&r2=23680&view=diff
==============================================================================
--- branches/frame_order_cleanup/sconstruct     (original)
+++ branches/frame_order_cleanup/sconstruct     Fri Jun  6 09:54:08 2014
@@ -25,7 +25,7 @@
 
 
 # Import statements.
-from os import F_OK, access, getcwd, path, remove, rmdir, sep, walk
+from os import F_OK, access, getcwd, path, remove, rmdir, sep, walk, environ
 import platform
 from re import search
 from shutil import rmtree
@@ -630,6 +630,11 @@
         for file in files:
             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'])
+
         # Build the relaxation curve fitting module.
         self.relax_fit_object = env.SharedLibrary(target=dir + path.sep + 
'relax_fit', source=nodes, SHLIBPREFIX=prefix, SHLIBSUFFIX=suffix)