Changed to use the xlc and xlC compilers by default.

MPI=NATIVE now works (at least on the Argonne SP2).

Tom


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

1 files changed, 53 insertions, 6 deletions

diff --git a/lib/make/known-architectures/aix b/lib/make/known-architectures/aix
index 8eeabc49..4441e88d 100644
--- a/lib/make/known-architectures/aix
+++ b/lib/make/known-architectures/aix
@@ -11,15 +11,45 @@
 
 if test "$CCTK_CONFIG_STAGE" = "preferred-compilers" ; then
 
-:
+  if test -z "$CC"; then
+    echo Setting C compiler to xlc
+    CC="xlc"
+  fi
+
+  if test -z "$CXX"; then
+    echo Setting C++ compiler to xlC
+    CXX="xlC"
+  fi
 
 else
 
   : ${F90FLAGS="-g -O2 -qfixed"}
   : ${F77FLAGS="-g -O2 -qfixed"}
 
-  : ${C_DEPEND_OUT=' > $@'}
-  : ${CXX_DEPEND_OUT=' > $@'}
+  case "$CC" in
+    gcc)
+     : ${C_DEPEND_OUT=' > $@'}
+     ;;
+    cc|xlc)
+     : ${C_DEPEND='$(CPP) -M $(CPPFLAGS)'}
+     : ${C_DEPEND_OUT=' > /dev/null ; mv $(basename $(basename $@)).u $@'}
+     ;;
+    *)
+     ;;
+  esac
+
+  case "$CXX" in
+    "g++"|"c++")
+     : ${CXX_DEPEND_OUT=' > $@'}
+     ;;
+    xlC)
+     : ${CXX_DEPEND='$(CPP) -M $(CPPFLAGS)'}
+     : ${CXX_DEPEND_OUT=' > /dev/null ; mv $(basename $(basename $@)).u $@'}
+     ;;
+    *)
+     ;;
+  esac
+
   : ${F_DEPEND_OUT=' > /dev/null ; mv $(basename $(basename $@)).u $@'}
   : ${F77_DEPEND_OUT=' > /dev/null ; mv $(basename $(basename $@)).u $@'}
 
@@ -29,9 +59,26 @@ else
   # MPI stuff
  
   if test -n "$MPI" ; then
-      NATIVE_MPI_LIBS="mpi"
-      NATIVE_MPI_LIB_DIRS="/usr/lpp/ppe.poe/lib"
-      NATIVE_MPI_INC_DIRS="/usr/lpp/ppe.poe/include"
+      case "$CC:$CXX" in 
+        "xlc:xlC"|"cc:xlC")
+          NATIVE_MPI_LIBS="mpi"
+          NATIVE_MPI_LIB_DIRS="/usr/lpp/ppe.poe/lib"
+          NATIVE_MPI_INC_DIRS="/usr/lpp/ppe.poe/include"
+          LD=mpCC
+          ;;
+         *)
+        echo "NATIVE MPI requires xlc and xlC"
+        echo "Please reconfigure with these compilers"
+        exit 1
+         ;;
+      esac
   fi          
 
 fi
+
+
+
+
+
+
+