Added neccessary '-64' flags to fortran and linker flags when cross-compiling

in 64 bit.


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

1 files changed, 38 insertions, 41 deletions

diff --git a/lib/make/known-architectures/hiuxwe2 b/lib/make/known-architectures/hiuxwe2
index 371366d5..83ae3419 100644
--- a/lib/make/known-architectures/hiuxwe2
+++ b/lib/make/known-architectures/hiuxwe2
@@ -17,93 +17,90 @@
 #              Added cross-compiling defines
 #   @endhdesc
 #   @endhistory
-#   @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/known-architectures/hiuxwe2,v 1.6 2002-03-20 16:12:14 tradke Exp $
+#   @version   $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/known-architectures/hiuxwe2,v 1.7 2002-05-13 18:09:22 tradke Exp $
 # @@*/
 
-if test "$CCTK_CONFIG_STAGE" = "preferred-compilers" ; then
+if test "$CCTK_CONFIG_STAGE" = 'preferred-compilers' ; then
 
   #
   # use the native compilers by default
   #
   if test -z "$CC"; then
     echo Setting C compiler to cc
-    CC="cc"
+    CC='cc'
   fi
 
   if test -z "$CXX"; then
     echo Setting C++ compiler to CC
-    CXX="CC"
+    CXX='CC'
   fi
 
   if test -z "$LD"; then
     echo Setting linker to CC
-    LD="CC"
+    LD='CC'
   fi
 
 else
 
-  : ${F77FLAGS="-conti199 -msg=w -uinline=2"}
-  : ${F90FLAGS="-conti199 -msg=w -uinline=2"}
-  if test "$LD" = "CC" ; then
+  : ${F77FLAGS='-conti199 -msg=w -uinline=2'}
+  : ${F90FLAGS='-conti199 -msg=w -uinline=2'}
+  if test "$LD" = 'CC' -o "$LD" = 'xf90' ; then
     F77FLAGS="$F77FLAGS -64"
     F90FLAGS="$F90FLAGS -64"
   fi
 
-  : ${F77_OPTIMISE_FLAGS="-opt=ss -pvfunc=2 -noparallel -model=F1"}
-  : ${F90_OPTIMISE_FLAGS="-opt=ss -pvfunc=2 -noparallel -model=F1 -noscope"}
+  : ${F77_OPTIMISE_FLAGS='-opt=ss -pvfunc=2 -noparallel -model=F1'}
+  : ${F90_OPTIMISE_FLAGS='-opt=ss -pvfunc=2 -noparallel -model=F1 -noscope'}
 
-  : ${F77_WARN_FLAGS="-fullmsg"}
-  : ${F90_WARN_FLAGS="-fullmsg"}
+  : ${F77_WARN_FLAGS='-fullmsg'}
+  : ${F90_WARN_FLAGS='-fullmsg'}
 
-  if test "$CC" = "cc" -o "$CC" = "xcc" ; then
+  if test "$CC" = 'cc' -o "$CC" = 'xcc' ; then
     CFLAGS="$CFLAGS -64"
-    : ${C_OPTIMISE_FLAGS="-O4 -pvec -pvfunc -predicate -model=F1"}
+    : ${C_OPTIMISE_FLAGS='-O4 -pvec -pvfunc -predicate -model=F1'}
   fi
-  if test "$CXX" = "CC" ; then
+  if test "$CXX" = 'CC' ; then
     CXXFLAGS="$CXXFLAGS -64"
-#   : ${CXX_OPTIMISE_FLAGS="-O4 -pvec -pvfunc -predicate -model=F1"}
+#   : ${CXX_OPTIMISE_FLAGS='-O4 -pvec -pvfunc -predicate -model=F1'}
   fi
-  if test "$LD" = "CC" ; then
+  if test "$LD" = 'CC' -o "$LD" = 'xf90'; then
     LDFLAGS="$LDFLAGS -64"
   fi
 
-# /lib/cpp cannot generate dependencies on this machine but we have gcc.
-: ${C_DEPEND='gcc -E -M $(CPPFLAGS)'}
-: ${CXX_DEPEND='$(C_DEPEND)'}
-: ${F_DEPEND='$(C_DEPEND) -x c'}
-: ${F77_DEPEND='$(F_DEPEND)'}
+  # /lib/cpp cannot generate dependencies on this machine but we have gcc.
+  : ${C_DEPEND='gcc -E -M $(CPPFLAGS)'}
+  : ${CXX_DEPEND='$(C_DEPEND)'}
+  : ${F_DEPEND='$(C_DEPEND) -x c'}
+  : ${F77_DEPEND='$(F_DEPEND)'}
 
-# Yet another CXX->C translator 8-(.
+  # Yet another CXX->C translator 8-(.
   : ${CXX_WORKING_NAME='$(notdir $<)'}
 
   : ${CXX_POSTPROCESSING='if test -r $(SCRATCH_BUILD)$(DIRSEP)$(basename $(basename $(notdir $@))).o ; then cp $(SCRATCH_BUILD)$(DIRSEP)$(basename $(basename $(notdir $@))).o $@ ; fi'}
 
-  : ${LIBS="f90s f90 hf90pvmath hf90math m"}
+  : ${LIBS='f90s f90 hf90pvmath hf90math m'}
 
-  : ${L2_CACHELINE_BYTES="128"}
-  : ${L2_CACHE_SIZE="128*1024"}
-
-# MPI stuff
+  : ${L2_CACHELINE_BYTES='128'}
+  : ${L2_CACHE_SIZE='128*1024'}
 
+  # MPI stuff
   if test -n "$MPI" ; then
-    NATIVE_MPI_LIBS="mpi"
-    if test "$LD" = "CC" ; then
-      NATIVE_MPI_LIB_DIRS="/usr/mpi/lib/lib64"
+    NATIVE_MPI_LIBS='mpi'
+    if test "$LD" = 'CC' ; then
+      NATIVE_MPI_LIB_DIRS='/usr/mpi/lib/lib64'
     else
-      NATIVE_MPI_LIB_DIRS="/usr/mpi/lib/lib32"
+      NATIVE_MPI_LIB_DIRS='/usr/mpi/lib/lib32'
     fi
-    NATIVE_MPI_INC_DIRS="/usr/mpi/include"
+    NATIVE_MPI_INC_DIRS='/usr/mpi/include'
   fi
 
-# PTHREADS stuff
-
-  if test "X$PTHREADS" = "Xyes"; then
-    PTHREADS_DEFINE="_PTHREADS_D10"
+  # PTHREADS stuff
+  if test "X$PTHREADS" = 'Xyes'; then
+    PTHREADS_DEFINE='_PTHREADS_D10'
   fi
 
-
-# stuff for cross-compiling
-  if test "x$cross_compiling" = "xyes" ; then
+  # stuff for cross-compiling
+  if test "x$cross_compiling" = 'xyes' ; then
     ENDIAN=big
 
     SIZEOF_SHORT_INT=2
@@ -117,7 +114,7 @@ else
 
     SIZEOF_POINTER=8
 
-    NULL_DEVICE="/dev/null"
+    NULL_DEVICE='/dev/null'
   fi
 
 fi