[Numpy-svn] r4293 - branches/numpy.scons/numpy/distutils/scons

numpy-svn@scip... numpy-svn@scip...
Thu Oct 25 06:23:51 CDT 2007


Author: cdavid
Date: 2007-10-25 06:23:46 -0500 (Thu, 25 Oct 2007)
New Revision: 4293

Modified:
   branches/numpy.scons/numpy/distutils/scons/custom_checkers.py
Log:
More fixes CheckCBLAS for accelerate framework on mac os X

Modified: branches/numpy.scons/numpy/distutils/scons/custom_checkers.py
===================================================================
--- branches/numpy.scons/numpy/distutils/scons/custom_checkers.py	2007-10-25 11:21:26 UTC (rev 4292)
+++ branches/numpy.scons/numpy/distutils/scons/custom_checkers.py	2007-10-25 11:23:46 UTC (rev 4293)
@@ -60,9 +60,11 @@
     oldLIBS = (env.has_key('LIBS') and deepcopy(env['LIBS'])) or []
     # XXX: RPATH, drawbacks using it ?
     oldRPATH = (env.has_key('RPATH') and deepcopy(env['RPATH'])) or []
+    oldLINKFLAGS = (env.has_key('LINKFLAGS') and deepcopy(env['LINKFLAGS'])) or []
     env.Append(LIBPATH = libpath)
     env.Append(LIBS = libs)
     env.Append(RPATH = libpath)
+    env.Append(LINKFLAGS = linkflags)
 
     # HACK: we add libpath and libs at the end of the source as a comment, to
     # add dependency of the check on those.
@@ -74,6 +76,7 @@
         env.Replace(LIBS = oldLIBS)
         env.Replace(LIBPATH = oldLIBPATH)
         env.Replace(RPATH = oldRPATH)
+        env.Replace(LINKFLAGS = oldLINKFLAGS)
         context.Result('Failed: %s test could not be linked and run' % name)
         return 0
 



More information about the Numpy-svn mailing list