]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Set F77FLAGS in the correct place.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Tue, 15 Sep 2009 13:32:29 +0000 (13:32 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Tue, 15 Sep 2009 13:32:29 +0000 (13:32 +0000)
git-svn-id: https://svn.dealii.org/trunk@19457 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/aclocal.m4
deal.II/configure

index 5d19ed0ffa76c68cee8ebac8958e81671d863cb0..50dbcf8869b8ddcbaf041bb5f9520589d8a51a50 100644 (file)
@@ -668,9 +668,6 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl
           CXXFLAGS="$CXXFLAGS -m64"
           CXXFLAGSG="$CXXFLAGSG -m64"
           CXXFLAGSO="$CXXFLAGSO -m64"
-         F77FLAGS="$F77FLAGS -m64"
-         F77FLAGSG="$F77FLAGSG -m64"
-          F77FLAGSO="$F77FLAGSO -m64"
           LDFLAGS="$LDFLAGS -m64"
         fi
 
@@ -1805,6 +1802,16 @@ AC_DEFUN(DEAL_II_SET_F77_FLAGS, dnl
            *cygwin* )
                 F77FLAGSPIC=
                 ;;
+
+           *apple-darwin*)
+               dnl Add -m64 to flags for the same TBB-related reason as
+               dnl above when setting CXXFLAGS
+                if test "`/usr/sbin/sysctl -n hw.optional.x86_64`" = "1" ; then
+                 F77FLAGSG="$F77FLAGSG -m64"
+                  F77FLAGSO="$F77FLAGSO -m64"
+                fi
+               ;;
+
            * )
                F77FLAGSPIC="-fPIC"
                 ;;
index 62b99d5a3d2b967b0cfccf9235ebb4d4de09db92..9f2d9703117a84611502f2db39b8ceff27abc09a 100755 (executable)
@@ -4641,9 +4641,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
           CXXFLAGS="$CXXFLAGS -m64"
           CXXFLAGSG="$CXXFLAGSG -m64"
           CXXFLAGSO="$CXXFLAGSO -m64"
-         F77FLAGS="$F77FLAGS -m64"
-         F77FLAGSG="$F77FLAGSG -m64"
-          F77FLAGSO="$F77FLAGSO -m64"
           LDFLAGS="$LDFLAGS -m64"
         fi
 
@@ -12123,6 +12120,14 @@ echo "${ECHO_T}F77 compiler is unkown. no flags set!" >&6; }
            *cygwin* )
                 F77FLAGSPIC=
                 ;;
+
+           *apple-darwin*)
+                                               if test "`/usr/sbin/sysctl -n hw.optional.x86_64`" = "1" ; then
+                 F77FLAGSG="$F77FLAGSG -m64"
+                  F77FLAGSO="$F77FLAGSO -m64"
+                fi
+               ;;
+
            * )
                F77FLAGSPIC="-fPIC"
                 ;;

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.