diff options
| author | schnetter <schnetter@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2007-02-27 05:27:23 +0000 |
|---|---|---|
| committer | schnetter <schnetter@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2007-02-27 05:27:23 +0000 |
| commit | cdeb7f2d9bb7fe4cadcf31d9d9e7a3bdaa82047c (patch) | |
| tree | dc98d9da05e6978e3c9cd5b6aa453938848a2b85 /lib/make/known-architectures | |
| parent | e523068316f7962ed5eb44144884e8f2edfde1e3 (diff) | |
Correct dependency generation for Fortran files:
Do not set F90_DEPEND, as this variable is not used. Move definition
of F77_DEPEND to where F_DEPEND is set.
Set F_DEPEND to "$(FPP)", which is evaluated when make runs, not to
the default value of FPP. This allows influencing F_DEPEND by setting
FPP.
Set AIX_[Ff]90_FLAGS to "-qfree", to be symmetric to AIX_[Ff]_FLAGS
and AIX_[Ff]77_FLAGS, which are set to "-qfixed".
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4411 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make/known-architectures')
| -rw-r--r-- | lib/make/known-architectures/aix | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/lib/make/known-architectures/aix b/lib/make/known-architectures/aix index d9b51513..ef402acb 100644 --- a/lib/make/known-architectures/aix +++ b/lib/make/known-architectures/aix @@ -50,7 +50,7 @@ else fi # Fortran compilers - # suppress congratulatory message on successful compilation + # suppress congratulatory message on successful compilation : ${F90FLAGS="-q$AIX_BITS -qextname -qsuppress=1501-510:cmpmsg"} : ${F77FLAGS="-q$AIX_BITS -qextname -qsuppress=1501-510:cmpmsg"} : ${F90_DEBUG_FLAGS='-g'} @@ -59,15 +59,15 @@ else : ${F90_SUFFIX='f'} CCTK_WriteLine make.arch.defn 'F90FLAGS += $(AIX_$(subst .,,$(suffix $<))_FLAGS)' CCTK_WriteLine make.arch.defn 'F77FLAGS += $(AIX_$(subst .,,$(suffix $<))_FLAGS)' - CCTK_WriteLine make.arch.defn 'AIX_F90_FLAGS =' - CCTK_WriteLine make.arch.defn 'AIX_f90_FLAGS =' + CCTK_WriteLine make.arch.defn 'AIX_F90_FLAGS = -qfree' + CCTK_WriteLine make.arch.defn 'AIX_f90_FLAGS = -qfree' CCTK_WriteLine make.arch.defn 'AIX_F77_FLAGS = -qfixed' CCTK_WriteLine make.arch.defn 'AIX_f77_FLAGS = -qfixed' CCTK_WriteLine make.arch.defn 'AIX_F_FLAGS = -qfixed' CCTK_WriteLine make.arch.defn 'AIX_f_FLAGS = -qfixed' : ${FPP='$(PERL) $(CCTK_HOME)/lib/sbin/cpp.pl'} - : ${F_DEPEND='$(PERL) $(CCTK_HOME)/lib/sbin/cpp.pl -M $(CPPFLAGS)'} + : ${F_DEPEND='$(FPP) -M $(FPPFLAGS)'} : ${F77_DEPEND=$F_DEPEND} F77_VERSION=`$F77 2>&1 | head -n1` @@ -116,7 +116,6 @@ else case "$F90" in xlf|xlf_r|xlf90|xlf90_r) - : ${F90_DEPEND='$(F90) -E -M $(F90FLAGS)'} : ${F90FLAGS="-q$AIX_BITS"} : ${F90_OPTIMISE_FLAGS="-O3 -qarch=auto -qtune=auto -qcache=auto -qhot"} ;; @@ -127,7 +126,6 @@ else case "$F77" in xlf|xlf_r|xlf77|xlf77_r|xlf90|xlf90_r) - : ${F77_DEPEND='$(F77) -E -M $(F77FLAGS)'} : ${FF77LAGS="-q$AIX_BITS"} : ${F77_OPTIMISE_FLAGS="-O3 -qarch=auto -qtune=auto -qcache=auto -qhot"} ;; @@ -140,9 +138,6 @@ else : ${ARFLAGS="-X$AIX_BITS -rucs"} if test -z "$LIBS" -a "$LD" != 'xlf90' ; then LIBS=xlf90 - if test -r /usr/lib/libxlopt.a ; then - LIBS="$LIBS xlopt" - fi fi # in 32-bit mode: allow each process to use up to 2 GB of virtual memory |