From a03e02de0413f5c5d6a0855504507aab50268a21 Mon Sep 17 00:00:00 2001 From: Rene Gassmoeller Date: Thu, 15 Jun 2017 23:55:37 +0200 Subject: [PATCH] Use $FF as Fortran77 compiler in p4est --- deal.II-toolchain/packages/p4est.package | 4 ++-- deal.II-toolchain/platforms/contributed/cray.platform | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/deal.II-toolchain/packages/p4est.package b/deal.II-toolchain/packages/p4est.package index 15c2910..6653cd9 100644 --- a/deal.II-toolchain/packages/p4est.package +++ b/deal.II-toolchain/packages/p4est.package @@ -68,7 +68,7 @@ package_specific_setup () { "${UNPACK_PATH}/${EXTRACTSTO}/configure" --enable-mpi --enable-shared \ --disable-vtk-binary --without-blas \ --prefix="$INSTALL_FAST" CFLAGS="$CFLAGS_FAST" \ - CPPFLAGS="-DSC_LOG_PRIORITY=SC_LP_ESSENTIAL" \ + CPPFLAGS="-DSC_LOG_PRIORITY=SC_LP_ESSENTIAL" F77="$FF" \ "$@" > config.output || bdie "Error in configure" make -C sc -j${PROCS} > make.output || bdie "Error in make sc" make -j${PROCS} >> make.output || bdie "Error in make p4est" @@ -82,7 +82,7 @@ package_specific_setup () { "${UNPACK_PATH}/${EXTRACTSTO}/configure" --enable-debug --enable-mpi --enable-shared \ --disable-vtk-binary --without-blas \ --prefix="$INSTALL_DEBUG" CFLAGS="$CFLAGS_DEBUG" \ - CPPFLAGS="-DSC_LOG_PRIORITY=SC_LP_ESSENTIAL" \ + CPPFLAGS="-DSC_LOG_PRIORITY=SC_LP_ESSENTIAL" F77="$FF" \ "$@" > config.output || bdie "Error in configure" make -C sc -j${PROCS} > make.output || bdie "Error in make sc" make -j${PROCS} >> make.output || bdie "Error in make p4est" diff --git a/deal.II-toolchain/platforms/contributed/cray.platform b/deal.II-toolchain/platforms/contributed/cray.platform index 9b68f3c..c481cb2 100644 --- a/deal.II-toolchain/platforms/contributed/cray.platform +++ b/deal.II-toolchain/platforms/contributed/cray.platform @@ -18,7 +18,6 @@ # export CXX=CC # export FC=ftn # export FF=ftn -# export F77=ftn # ## -- 2.39.5