[cig-commits] r4380 - in long/3D/Gale/trunk: . python/BuildSystem/config

[walter at geodynamics.org]

Author: walter
Date: 2006-08-17 17:37:43 -0700 (Thu, 17 Aug 2006)
New Revision: 4380

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/python/BuildSystem/config/setCompilers.py
Log:
 r607 at earth:  boo | 2006-08-17 15:59:05 -0700
 Remove fortran and C++ stuff



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

Modified: long/3D/Gale/trunk/python/BuildSystem/config/setCompilers.py
===================================================================
--- long/3D/Gale/trunk/python/BuildSystem/config/setCompilers.py	2006-08-18 00:37:34 UTC (rev 4379)
+++ long/3D/Gale/trunk/python/BuildSystem/config/setCompilers.py	2006-08-18 00:37:43 UTC (rev 4380)
@@ -1152,21 +1152,21 @@
     if hasattr(self, 'CPP'):
       self.addSubstitution('CPP', self.CPP)
       self.addSubstitution('CPPFLAGS', self.CPPFLAGS)
-    if hasattr(self, 'CXX'):
-      self.addSubstitution('CXX', self.CXX)
-      self.addSubstitution('CXX_CXXFLAGS', self.CXX_CXXFLAGS)
-      self.addSubstitution('CXXFLAGS', self.CXXFLAGS)
-      self.addSubstitution('CXX_LINKER_SLFLAG', self.CxxSharedLinkerFlag)
-    else:
-      self.addSubstitution('CXX', '')
-    if hasattr(self, 'CXXCPP'):
-      self.addSubstitution('CXXCPP', self.CXXCPP)
-    if hasattr(self, 'FC'):
-      self.addSubstitution('FC', self.FC)
-      self.addSubstitution('FFLAGS', self.FFLAGS)
-      self.addMakeMacro('FC_LINKER_SLFLAG', self.FCSharedLinkerFlag)
-    else:
-      self.addSubstitution('FC', '')
+#     if hasattr(self, 'CXX'):
+#       self.addSubstitution('CXX', self.CXX)
+#       self.addSubstitution('CXX_CXXFLAGS', self.CXX_CXXFLAGS)
+#       self.addSubstitution('CXXFLAGS', self.CXXFLAGS)
+#       self.addSubstitution('CXX_LINKER_SLFLAG', self.CxxSharedLinkerFlag)
+#     else:
+#       self.addSubstitution('CXX', '')
+#     if hasattr(self, 'CXXCPP'):
+#       self.addSubstitution('CXXCPP', self.CXXCPP)
+#     if hasattr(self, 'FC'):
+#       self.addSubstitution('FC', self.FC)
+#       self.addSubstitution('FFLAGS', self.FFLAGS)
+#       self.addMakeMacro('FC_LINKER_SLFLAG', self.FCSharedLinkerFlag)
+#     else:
+#       self.addSubstitution('FC', '')
     self.addSubstitution('LDFLAGS', self.LDFLAGS)
     self.addSubstitution('LIBS', self.LIBS)
     if hasattr(self, 'sharedLibraryFlags'):
@@ -1180,21 +1180,21 @@
     self.executeTest(self.checkInitialFlags)
     self.executeTest(self.checkCCompiler)
     self.executeTest(self.checkCPreprocessor)
-    self.executeTest(self.checkCxxCompiler)
-    if hasattr(self, 'CXX'):
-      self.executeTest(self.checkCxxPreprocessor)
-    self.executeTest(self.checkFortranCompiler)
-    if hasattr(self, 'FC'):
-      self.executeTest(self.checkFortranComments)
-      self.executeTest(self.checkBrokenMpif90)
-    self.executeTest(self.checkPIC)
-    self.executeTest(self.checkLargeFileIO)
+#     self.executeTest(self.checkCxxCompiler)
+#     if hasattr(self, 'CXX'):
+#       self.executeTest(self.checkCxxPreprocessor)
+#     self.executeTest(self.checkFortranCompiler)
+#     if hasattr(self, 'FC'):
+#       self.executeTest(self.checkFortranComments)
+#       self.executeTest(self.checkBrokenMpif90)
+#     self.executeTest(self.checkPIC)
+#     self.executeTest(self.checkLargeFileIO)
     self.executeTest(self.checkArchiver)
     self.executeTest(self.checkSharedLinker)
-    if Configure.isDarwin():
-      self.executeTest(self.checkLinkerMac)
+#     if Configure.isDarwin():
+#       self.executeTest(self.checkLinkerMac)
     self.executeTest(self.checkSharedLinkerPaths)
-    self.executeTest(self.checkLibC)
+#     self.executeTest(self.checkLibC)
     self.executeTest(self.checkDynamicLinker)
     self.executeTest(self.output)
     return