[cig-commits] r5984 - in long/3D/Gale/trunk: . python/Gale/packages

[walter at geodynamics.org]

Author: walter
Date: 2007-02-08 09:28:20 -0800 (Thu, 08 Feb 2007)
New Revision: 5984

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/python/Gale/packages/petsc.py
Log:
 r1533 at earth:  boo | 2007-02-08 08:58:28 -0800
 Fix linking with petsc that is linked with fortran



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1532
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1533

Modified: long/3D/Gale/trunk/python/Gale/packages/petsc.py
===================================================================
--- long/3D/Gale/trunk/python/Gale/packages/petsc.py	2007-02-08 17:28:17 UTC (rev 5983)
+++ long/3D/Gale/trunk/python/Gale/packages/petsc.py	2007-02-08 17:28:20 UTC (rev 5984)
@@ -66,6 +66,7 @@
       # to get all of the dependencies as well.
       packages_libs=''
       packages_includes=''
+      packages_flags=''
 
       if staticLibrary:
         if os.path.exists(bmakeDir + '/petscconf'):
@@ -79,6 +80,16 @@
           packages_includes+= \
             expand_makefile_vars(str(vars['MPI_INCLUDE']),vars) + ' ' \
             + expand_makefile_vars(str(vars['BLASLAPACK_INCLUDE']),vars)
+
+          # Do not use PCC_LINKER, since we are using our own C compiler.
+#           if vars.has_key('PCC_LINKER'):
+          if vars.has_key('PCC_LINKER_FLAGS'):
+            packages_flags+=expand_makefile_vars(str(vars['PCC_LINKER_FLAGS']),vars)
+          if vars.has_key('PCC_FLAGS'):
+            packages_flags+=' '+expand_makefile_vars(str(vars['PCC_FLAGS']),vars)
+          if vars.has_key('PCC_LINKER_LIBS'):
+            packages_libs+=' '+expand_makefile_vars(str(vars['PCC_LINKER_LIBS']),vars)
+
           self.compilers.LIBS += ' ' + packages_libs
       elif config.setCompilers.Configure.isDarwin():
         self.compilers.LIBS += ' -framework vecLib'
@@ -94,7 +105,7 @@
       for library in testLibraries:
         self.libs+=library + ' '
         self.lib+='-l' + library + ' '
-      self.dependencies=packages_includes + ' ' + packages_libs
+      self.dependencies=packages_includes + ' ' + packages_libs + ' ' + packages_flags
     return foundLibrary
 
   def check_petsc_dir(self, petsc_dir, petsc_arch):