From 51f0b9b9f2eef480f040117ef575946a8553cd1a Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Tue, 15 Sep 2009 13:32:29 +0000 Subject: [PATCH] Set F77FLAGS in the correct place. git-svn-id: https://svn.dealii.org/trunk@19457 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 13 ++++++++++--- deal.II/configure | 11 ++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 5d19ed0ffa..50dbcf8869 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -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" ;; diff --git a/deal.II/configure b/deal.II/configure index 62b99d5a3d..9f2d970311 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -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" ;; -- 2.39.5