Tidying darwin knownarchitectures. Removing all previous versions of darwin since they were not incorporated in a single file and are of unknown status. Previous versions will be added back properly on request.

git-svn-id: http://svn.cactuscode.org/flesh/trunk@3597 17b73243-c579-4c4c-a9d2-2d5706c11dac

16 files changed, 129 insertions, 370 deletions

diff --git a/lib/make/known-architectures/darwin b/lib/make/known-architectures/darwin
index e5200f49..d1e0b30a 100644
--- a/lib/make/known-architectures/darwin
+++ b/lib/make/known-architectures/darwin
@@ -1,80 +1,142 @@
 #! /bin/sh
 # /*@@
-#   @file    darwin
-#   @date    Thu 10 May 2001
-#   @author  Thomas Radke
+#   @file    darwin6.8
+#   @date    Mon 6 Oct 2003
+#   @author  John Shalf
 #   @desc
-#            Known architecture stuff for MacOS X (Darwin)
+#            Known architecture stuff for MacOS X (Darwin) release 6.8
 #   @enddesc
-#   @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/known-architectures/darwin,v 1.7 2003-04-02 14:57:23 goodale Exp $
+#   @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/known-architectures/darwin,v 1.8 2004-03-23 18:49:08 allen Exp $
 # @@*/
 
 if test "$CCTK_CONFIG_STAGE" = 'preferred-compilers' ; then
 
   :
 
+elif test -n "$IBMXL" && test "$IBMXL" = 'yes' ; then
+  echo "Configuring environment for IBM XL compilers"
+  CC=xlc
+  CXX=xlC
+  F90=xlf
+  F90=xlf
+  LD=xlC
+  : ${ARFLAGS='-rucs'}
+  : ${F90FLAGS='-qspill=10000 -qmaxmem=-1 -qnullterm'}
+  : ${F77FLAGS='-qfixed -qmaxmem=-1 -qnullterm'}
+  : ${F90_OPTIMISE_FLAGS='-O5'}
+  : ${F77_OPTIMISE_FLAGS='-O5'}
+  : ${F90_DEBUG_FLAGS='-g'}
+  : ${F77_DEBUG_FLAGS='-g'}
+  : ${CFLAGS='-qspill=17000 -qmaxmem=-1'}
+  : ${CXXFLAGS='-qspill=10000 -qmaxmem=-1'}
+  : ${C_OPTIMISE_FLAGS='-O5'}
+  : ${CXX_OPTIMISE_FLAGS='-O5'}
+  : ${F90_SUFFIX='f'}
+  if test -e '/usr/lib/gcc/darwin/3.3' ; then
+    C_DEPEND='gcc -M -no-cpp-precomp $(CPPFLAGS)'
+    CXX_DEPEND='g++ -E -M $(CPPFLAGS)'
+    F_DEPEND='$(CPP) -M $(CPPFLAGS)'
+    F77_DEPEND='$(CPP) -M $(CPPFLAGS)'
+  else
+    C_DEPEND='$(PERL) $(CCTK_HOME)/lib/sbin/cpp.pl -M $(CPPFLAGS)'
+    CXX_DEPEND='$(PERL) $(CCTK_HOME)/lib/sbin/cpp.pl -M $(CPPFLAGS)'
+    F_DEPEND='$(PERL) $(CCTK_HOME)/lib/sbin/cpp.pl -M $(CPPFLAGS)'
+  fi
+  : ${LD='xlC'}
+  : ${LIBS='xlf90 xlfmath m'}
+  : ${LIBDIRS='/opt/ibmcmp/lib'}
+
 else
 
   # this fixes some darwin-specific preprocessor bugs (?)
   CFLAGS='-no-cpp-precomp'
-  C_DEPEND='$(CC) -M $(CFLAGS) $(CPPFLAGS)'
-
+  # C_DEPEND='$(CC) -M $(CFLAGS) $(CPPFLAGS)'
+  if test -e '/usr/lib/gcc/darwin/3.3' ; then
+    C_DEPEND='gcc -M -no-cpp-precomp $(CPPFLAGS)'
+    CXX_DEPEND='g++ -E -M $(CPPFLAGS)'
+    F_DEPEND='$(CPP) -M $(CPPFLAGS)'
+    F77_DEPEND='$(CPP) -M $(CPPFLAGS)'
+  else
+    C_DEPEND='$(PERL) $(CCTK_HOME)/lib/sbin/cpp.pl -M $(CPPFLAGS)'
+    CXX_DEPEND='$(PERL) $(CCTK_HOME)/lib/sbin/cpp.pl -M $(CPPFLAGS)'
+    F_DEPEND='$(PERL) $(CCTK_HOME)/lib/sbin/cpp.pl -M $(CPPFLAGS)'
+    FPP='$(PERL) $(CCTK_HOME)/lib/sbin/cpp.pl -M $(CPPFLAGS)'
+  fi
   # Determine which Fortran 90 compiler is in use
   MAC_F90_COMP=none
 
-  if test -n "$F90" && test "$F90" != 'none' ; then 
-    MAC_F90_COMP=absoft
-  elif test -n "$F77" ; then 
+  if test -n "$F90" && test "$F90" != 'none' ; then
+# this should really check the path of the IBM compiler
+# to make sure it is the default
+# should use a regexp to match the compiler path
+    if test `which f90` = '/opt/ibmcmp/xlf/8.1/bin/f90' ; then
+      MAC_F90_COMP=ibm
+      F90=xlf
+      F77=xlf
+    else
+      MAC_F90_COMP=absoft
+    fi
+  elif test -n "$F77" ; then
     if test "`$F77 -? 2>&1 | grep -i absoft`" ; then
-        MAC_F77_COMP=absoft77
+      MAC_F77_COMP=absoft77
     else
-        echo Unknown MacOS X f77 compiler.
-        echo Please add appropriate information to 
-        echo $srcdir/known-architectures/darwin
-        echo ad send the updated file to CactusMaint
-        echo We will try anyway ...
+      echo Unknown MacOS X f77 compiler.
+      echo Please add appropriate information to
+      echo $srcdir/known-architectures/darwin
+      echo and send the updated file to CactusMaint
+      echo We will try anyway ...
     fi
   fi
 
   #Set the appropriate flags
   case "$MAC_F90_COMP" in
-     absoft)
-#       : ${F90FLAGS='-N11'}
-       : ${LIBS='f90math fio f77math m'} 
-       : ${F90_OPTIMISE_FLAGS='-s -O'}
-       : ${F77_OPTIMISE_FLAGS='-s -O'}
-       # Test if it is a version of the absoft compiler which has the library in a custom place.
-       if test -n "$ABSOFT" ; then
-         : ${LIBDIRS='$(ABSOFT)/lib'}
-       fi 
-       : ${F77_DEBUG_FLAGS='-g'}
-       : ${F90_DEBUG_FLAGS='-g'}
-       : ${F77_WARN_FLAGS='-m0'}
-       : ${F90_WARN_FLAGS='-m0'}
-       ;;
-     absoft77)
-       : ${LIBS='fio f77math m'}
-       F90FLAGS='-f'
-       # Test if it is a version of the absoft compiler which has the library in a custom place.
-       if test -n "$ABSOFT" ; then
-         : ${LIBDIRS='$(ABSOFT)/lib'}
-       fi 
-       : ${F77_DEBUG_FLAGS='-g'}
-       : ${F90_DEBUG_FLAGS='-g'}
-       : ${F77_WARN_FLAGS='-m0'}
-       : ${F90_WARN_FLAGS='-m0'}
-       ;;
-     none)
-       : ${LIBS='m'} 
-       ;;
-     *)
-       echo Unknown Darwin f90 compiler.
-       echo Please add appropriate information to 
-       echo $srcdir/known-architectures/darwin
-       echo and send the updated file to CactusMaint
-       echo We will try anyway ...
-       ;;
-  esac    
+    absoft)
+      : ${LIBS='f90math fio f77math m'}
+      : ${F90_OPTIMISE_FLAGS='-s -O'}
+      : ${F77_OPTIMISE_FLAGS='-s -O'}
+      # Test if it is a version of the absoft compiler which has the library in a custom place.
+      if test -n "$ABSOFT" ; then
+        : ${LIBDIRS='$(ABSOFT)/lib'}
+      fi
+      : ${F77_DEBUG_FLAGS='-g'}
+      : ${F90_DEBUG_FLAGS='-g'}
+      : ${F77_WARN_FLAGS='-m0'}
+      : ${F90_WARN_FLAGS='-m0'}
+      ;;
+    absoft77)
+      : ${LIBS='fio f77math m'}
+      F90FLAGS='-f'
+      # Test if it is a version of the absoft compiler which has the library in a custom place.
+      if test -n "$ABSOFT" ; then
+        : ${LIBDIRS='$(ABSOFT)/lib'}
+      fi
+      : ${F77_DEBUG_FLAGS='-g'}
+      : ${F90_DEBUG_FLAGS='-g'}
+      : ${F77_WARN_FLAGS='-m0'}
+      : ${F90_WARN_FLAGS='-m0'}
+      ;;
+    ibm)
+      : ${LD='xlC'}
+      : ${LIBS='xlf90 xlfmath m'}
+      : ${LIBDIRS='/opt/ibmcmp/lib'}
+      : ${ARFLAGS='-rucs'}
+      : ${F90FLAGS=' -k -qspill=10000 -qmaxmem=-1 -qnullterm'}
+      : ${F77FLAGS='-qfixed -qmaxmem=-1 -qnullterm'}
+      : ${F90_OPTIMISE_FLAGS='-O5'}
+      : ${F77_OPTIMISE_FLAGS='-O5'}
+      : ${F90_SUFFIX='f'}
+      ;;
+    none)
+      : ${LIBS='m'}
+      ;;
+    *)
+      echo Unknown Darwin f90 compiler.
+      echo Please add appropriate information to
+      echo $srcdir/known-architectures/darwin
+      echo and send the updated file to CactusMaint
+      echo We will try anyway ...
+      ;;
+  esac
 
   # Darwin's ar command doesn't understand the '-s' flag
   # so we have to use ranlib to add a table of contents to libraries
@@ -87,3 +149,4 @@ else
   # This is caught later on by lib/make/extras/MPI/NATIVE.
 
 fi
+
diff --git a/lib/make/known-architectures/darwin1.3 b/lib/make/known-architectures/darwin1.3
deleted file mode 100644
index 24e2698d..00000000
--- a/lib/make/known-architectures/darwin1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-# /*@@
-#   @file    darwin1.3
-#   @date    Thu 10 May 2001
-#   @author  Thomas Radke
-#   @desc
-#            Known architecture stuff for MacOS X (Darwin 1.3)
-#   @enddesc
-#   @version $Header$
-# @@*/
-
-. $srcdir/known-architectures/darwin
diff --git a/lib/make/known-architectures/darwin1.3.3 b/lib/make/known-architectures/darwin1.3.3
deleted file mode 100644
index 3f3c3b6f..00000000
--- a/lib/make/known-architectures/darwin1.3.3
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-# /*@@
-#   @file    darwin
-#   @date    Thu 10 May 2001
-#   @author  Thomas Radke
-#   @desc
-#            Known architecture stuff for MacOS X (Darwin1.3.3)
-#   @enddesc
-#   @version $Header$
-# @@*/
-
-. $srcdir/known-architectures/darwin
diff --git a/lib/make/known-architectures/darwin1.3.7 b/lib/make/known-architectures/darwin1.3.7
deleted file mode 100644
index b745e9cd..00000000
--- a/lib/make/known-architectures/darwin1.3.7
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-# /*@@
-#   @file    darwin1.3.7
-#   @date    Sept 17 2001
-#   @author  Gabrielle Allen
-#   @desc
-#            Known architecture stuff for MacOS X (Darwin1.3.7)
-#   @enddesc
-#   @version $Header$
-# @@*/
-
-. $srcdir/known-architectures/darwin
diff --git a/lib/make/known-architectures/darwin1.4 b/lib/make/known-architectures/darwin1.4
deleted file mode 100644
index e32a2e5b..00000000
--- a/lib/make/known-architectures/darwin1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-# /*@@
-#   @file    darwin1.4
-#   @date    Wed 19 Dec 2001
-#   @author  Thomas Radke
-#   @desc
-#            Known architecture stuff for MacOS X (Darwin1.4)
-#   @enddesc
-#   @version $Header$
-# @@*/
-
-. $srcdir/known-architectures/darwin
diff --git a/lib/make/known-architectures/darwin5.1 b/lib/make/known-architectures/darwin5.1
deleted file mode 100644
index 34c591e1..00000000
--- a/lib/make/known-architectures/darwin5.1
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-# /*@@
-#   @file    darwin5.1
-#   @date    Thu 20 Dec 2001
-#   @author  Thomas Radke
-#   @desc
-#            Known architecture stuff for MacOS X (Darwin5.1)
-#   @enddesc
-#   @version $Header$
-# @@*/
-
-. $srcdir/known-architectures/darwin
diff --git a/lib/make/known-architectures/darwin5.2 b/lib/make/known-architectures/darwin5.2
deleted file mode 100644
index 2504aebe..00000000
--- a/lib/make/known-architectures/darwin5.2
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-# /*@@
-#   @file    darwin5.2
-#   @date    Wed 2 Jan 2002
-#   @author  Thomas Radke
-#   @desc
-#            Known architecture stuff for MacOS X (Darwin5.2)
-#   @enddesc
-#   @version $Header$
-# @@*/
-
-. $srcdir/known-architectures/darwin
diff --git a/lib/make/known-architectures/darwin5.3 b/lib/make/known-architectures/darwin5.3
deleted file mode 100644
index 5d1fdf86..00000000
--- a/lib/make/known-architectures/darwin5.3
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-# /*@@
-#   @file    darwin5.3
-#   @date    Fri 19 April 2002
-#   @author  Thomas Radke
-#   @desc
-#            Known architecture stuff for MacOS X (Darwin5.3)
-#   @enddesc
-#   @version $Header$
-# @@*/
-
-. $srcdir/known-architectures/darwin
diff --git a/lib/make/known-architectures/darwin5.4 b/lib/make/known-architectures/darwin5.4
deleted file mode 100644
index e3c044fb..00000000
--- a/lib/make/known-architectures/darwin5.4
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-# /*@@
-#   @file    darwin5.4
-#   @date    Fri 19 April 2002
-#   @author  Thomas Radke
-#   @desc
-#            Known architecture stuff for MacOS X (Darwin5.4)
-#   @enddesc
-#   @version $Header$
-# @@*/
-
-. $srcdir/known-architectures/darwin
diff --git a/lib/make/known-architectures/darwin5.5 b/lib/make/known-architectures/darwin5.5
deleted file mode 100644
index fa426924..00000000
--- a/lib/make/known-architectures/darwin5.5
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-# /*@@
-#   @file    darwin5.5
-#   @date    Tue 16 July 2002
-#   @author  Thomas Radke
-#   @desc
-#            Known architecture stuff for MacOS X (Darwin5.5)
-#   @enddesc
-#   @version $Header$
-# @@*/
-
-. $srcdir/known-architectures/darwin
diff --git a/lib/make/known-architectures/darwin6.4 b/lib/make/known-architectures/darwin6.4
deleted file mode 100644
index f4813bb9..00000000
--- a/lib/make/known-architectures/darwin6.4
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-# /*@@
-#   @file    darwin6.4
-#   @date    Wed 2 Apr 2003
-#   @author  Tom Goodale
-#   @desc
-#            Known architecture stuff for MacOS X (Darwin6.4)
-#   @enddesc
-#   @version $Header$
-# @@*/
-
-. $srcdir/known-architectures/darwin
diff --git a/lib/make/known-architectures/darwin6.5 b/lib/make/known-architectures/darwin6.5
deleted file mode 100644
index 8fa8abc9..00000000
--- a/lib/make/known-architectures/darwin6.5
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-# /*@@
-#   @file    darwin6.5
-#   @date    Wed 23 Apr 2003
-#   @author  Tom Goodale
-#   @desc
-#            Known architecture stuff for MacOS X (Darwin6.5)
-#   @enddesc
-#   @version $Header$
-# @@*/
-
-. $srcdir/known-architectures/darwin
diff --git a/lib/make/known-architectures/darwin6.6 b/lib/make/known-architectures/darwin6.6
deleted file mode 100644
index 47109aae..00000000
--- a/lib/make/known-architectures/darwin6.6
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh
-# /*@@
-#   @file    darwin6.6
-#   @date    Mon 21 July 2003
-#   @author  Gabrielle Allen
-#   @desc
-#            Known architecture stuff for MacOS X (Darwin6.6)
-#   @enddesc
-#   @version $Header$
-# @@*/
-
-# The preprocessor under Darwin 6.6 doesn't seem to be able to process other
-# languages than C when used to create dependencies.
-# So dependency generation for C++ or Fortran files will be disabled for now.
-: ${CXX_DEPEND='echo'}
-: ${F_DEPEND='echo'}
-: ${F77_DEPEND='echo'}
-: ${CXX_DEPEND_OUT='> /dev/null; touch $@'}
-: ${F_DEPEND_OUT='> /dev/null; touch $@'}
-: ${F77_DEPEND_OUT='> /dev/null; touch $@'}
-
-. $srcdir/known-architectures/darwin
diff --git a/lib/make/known-architectures/darwin6.7.5 b/lib/make/known-architectures/darwin6.7.5
deleted file mode 100644
index 7d249840..00000000
--- a/lib/make/known-architectures/darwin6.7.5
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-# /*@@
-#   @file    darwin6.7.5
-#   @date    Wed 3rd Sept 2003
-#   @author  Gabrielle Allen
-#   @desc
-#            Known architecture stuff for MacOS X (Darwin 6.7.5)
-#   @enddesc
-#   @version $Header$
-# @@*/
-
-. $srcdir/known-architectures/darwin
diff --git a/lib/make/known-architectures/darwin6.8 b/lib/make/known-architectures/darwin6.8
deleted file mode 100644
index c54fc6c4..00000000
--- a/lib/make/known-architectures/darwin6.8
+++ /dev/null
@@ -1,151 +0,0 @@
-#! /bin/sh
-# /*@@
-#   @file    darwin6.8
-#   @date    Mon 6 Oct 2003
-#   @author  John Shalf
-#   @desc
-#            Known architecture stuff for MacOS X (Darwin) release 6.8
-#   @enddesc
-#   @version $Header$
-# @@*/
-
-if test "$CCTK_CONFIG_STAGE" = 'preferred-compilers' ; then
-
-  :
-
-elif test -n "$IBMXL" && test "$IBMXL" = 'yes' ; then
-  echo "Configuring environment for IBM XL compilers"
-  CC=xlc
-  CXX=xlC
-  F90=xlf
-  F90=xlf
-  LD=xlC
-  : ${ARFLAGS='-rucs'}
-  : ${F90FLAGS='-qspill=10000 -qmaxmem=-1 -qnullterm'}
-  : ${F77FLAGS='-qfixed -qmaxmem=-1 -qnullterm'}
-  : ${F90_OPTIMISE_FLAGS='-O5'}
-  : ${F77_OPTIMISE_FLAGS='-O5'}
-  : ${F90_DEBUG_FLAGS='-g'}
-  : ${F77_DEBUG_FLAGS='-g'}
-  : ${CFLAGS='-qspill=17000 -qmaxmem=-1'}
-  : ${CXXFLAGS='-qspill=10000 -qmaxmem=-1'}
-  : ${C_OPTIMISE_FLAGS='-O5'}
-  : ${CXX_OPTIMISE_FLAGS='-O5'}
-# : ${F90_SUFFIX='f'}
-  if test -e '/usr/lib/gcc/darwin/3.3' ; then
-    C_DEPEND='gcc -M -no-cpp-precomp $(CPPFLAGS)'
-    CXX_DEPEND='g++ -E -M $(CPPFLAGS)'
-    F_DEPEND='$(CPP) -M $(CPPFLAGS)'
-    F77_DEPEND='$(CPP) -M $(CPPFLAGS)'
-  else
-    echo "Yo buddy.  You need to go to the ADC website and"
-    echo "update to gcc 3.3 "
-    C_DEPEND='$(PERL) $(CCTK_HOME)/lib/sbin/cpp.pl -M $(CPPFLAGS)'
-    F_DEPEND='$(PERL) $(CCTK_HOME)/lib/sbin/cpp.pl -M $(CPPFLAGS)'
-  fi
-  : ${LD='xlC'}
-  : ${LIBS='xlf90 xlfmath m'}
-  : ${LIBDIRS='/opt/ibmcmp/lib'}
-
-else
-
-  # this fixes some darwin-specific preprocessor bugs (?)
-  CFLAGS='-no-cpp-precomp'
-  # C_DEPEND='$(CC) -M $(CFLAGS) $(CPPFLAGS)'
-  if test -e '/usr/lib/gcc/darwin/3.3' ; then
-    C_DEPEND='gcc -M -no-cpp-precomp $(CPPFLAGS)'
-    CXX_DEPEND='g++ -E -M $(CPPFLAGS)'
-    F_DEPEND='$(CPP) -M $(CPPFLAGS)'
-    F77_DEPEND='$(CPP) -M $(CPPFLAGS)'
-  else
-    echo "Yo buddy.  You need to go to the ADC website and"
-    echo "update to gcc 3.3 "
-    C_DEPEND='$(PERL) $(CCTK_HOME)/lib/sbin/cpp.pl -M $(CPPFLAGS)'
-    F_DEPEND='$(PERL) $(CCTK_HOME)/lib/sbin/cpp.pl -M $(CPPFLAGS)'
-  fi
-  # Determine which Fortran 90 compiler is in use
-  MAC_F90_COMP=none
-
-  if test -n "$F90" && test "$F90" != 'none' ; then
-# this should really check the path of the IBM compiler
-# to make sure it is the default
-# should use a regexp to match the compiler path
-    if test `which f90` = '/opt/ibmcmp/xlf/8.1/bin/f90' ; then
-      MAC_F90_COMP=ibm
-      F90=xlf
-      F77=xlf
-    else
-      MAC_F90_COMP=absoft
-    fi
-  elif test -n "$F77" ; then
-    if test "`$F77 -? 2>&1 | grep -i absoft`" ; then
-      MAC_F77_COMP=absoft77
-    else
-      echo Unknown MacOS X f77 compiler.
-      echo Please add appropriate information to
-      echo $srcdir/known-architectures/darwin
-      echo ad send the updated file to CactusMaint
-      echo We will try anyway ...
-    fi
-  fi
-
-  #Set the appropriate flags
-  case "$MAC_F90_COMP" in
-    absoft)
-      : ${LIBS='f90math fio f77math m'}
-      : ${F90_OPTIMISE_FLAGS='-s -O'}
-      : ${F77_OPTIMISE_FLAGS='-s -O'}
-      # Test if it is a version of the absoft compiler which has the library in a custom place.
-      if test -n "$ABSOFT" ; then
-        : ${LIBDIRS='$(ABSOFT)/lib'}
-      fi
-      : ${F77_DEBUG_FLAGS='-g'}
-      : ${F90_DEBUG_FLAGS='-g'}
-      : ${F77_WARN_FLAGS='-m0'}
-      : ${F90_WARN_FLAGS='-m0'}
-      ;;
-    absoft77)
-      : ${LIBS='fio f77math m'}
-      F90FLAGS='-f'
-      # Test if it is a version of the absoft compiler which has the library in a custom place.
-      if test -n "$ABSOFT" ; then
-        : ${LIBDIRS='$(ABSOFT)/lib'}
-      fi
-      : ${F77_DEBUG_FLAGS='-g'}
-      : ${F90_DEBUG_FLAGS='-g'}
-      : ${F77_WARN_FLAGS='-m0'}
-      : ${F90_WARN_FLAGS='-m0'}
-      ;;
-    ibm)
-      : ${LD='xlC'}
-      : ${LIBS='xlf90 xlfmath m'}
-      : ${LIBDIRS='/opt/ibmcmp/lib'}
-      : ${ARFLAGS='-rucs'}
-      : ${F90FLAGS='-qspill=10000 -qmaxmem=-1 -qnullterm'}
-      : ${F77FLAGS='-qfixed -qmaxmem=-1 -qnullterm'}
-      : ${F90_OPTIMISE_FLAGS='-O5'}
-      : ${F77_OPTIMISE_FLAGS='-O5'}
-      ;;
-    none)
-      : ${LIBS='m'}
-      ;;
-    *)
-      echo Unknown Darwin f90 compiler.
-      echo Please add appropriate information to
-      echo $srcdir/known-architectures/darwin
-      echo and send the updated file to CactusMaint
-      echo We will try anyway ...
-      ;;
-  esac
-
-  # Darwin's ar command doesn't understand the '-s' flag
-  # so we have to use ranlib to add a table of contents to libraries
-  : ${ARFLAGS='ruc'}
-  : ${USE_RANLIB='yes'}
-
-  # MPI stuff
-  #
-  # Darwin has no native MPI, so we don't set any NATIVE_MPI_XXX variables.
-  # This is caught later on by lib/make/extras/MPI/NATIVE.
-
-fi
diff --git a/lib/make/known-architectures/darwin7.2.0 b/lib/make/known-architectures/darwin7.2.0
new file mode 100644
index 00000000..dc04c243
--- /dev/null
+++ b/lib/make/known-architectures/darwin7.2.0
@@ -0,0 +1,13 @@
+#! /bin/sh
+# /*@@
+#   @file    darwin7.2.0
+#   @date    Mon 6 Oct 2003
+#   @author  John Shalf
+#   @desc
+#            Known architecture stuff for MacOS X (Darwin) release 7.2.0
+#   @enddesc
+#   @version $Header$
+# @@*/
+
+. $srcdir/known-architectures/darwin
+