(file) Return to make_basic.mk CVS log (file) (dir) Up to [Development] / JSOC

Diff for /JSOC/make_basic.mk between version 1.48 and 1.49

version 1.48, 2009/07/24 23:42:52 version 1.49, 2009/07/27 23:50:08
Line 252  ifeq ($(FCOMPILER), ifort)
Line 252  ifeq ($(FCOMPILER), ifort)
   ifeq ($(JSOC_MACHINE), linux_x86_64)   ifeq ($(JSOC_MACHINE), linux_x86_64)
     FCFLAGS_OPT := -xW     FCFLAGS_OPT := -xW
   endif   endif
   FCLFAGS_INIT := -ftrapuv    FCFLAGS_INIT := -ftrapuv
 else else
   # must be gfortran   # must be gfortran
   FCFLAGS_OPT   := -g    FCFLAGS_OPT   :=
   FCLFAGS_INIT  :=    FCFLAGS_INIT  :=
 endif endif
  
 ifeq ($(DEBUG), 0) ifeq ($(DEBUG), 0)
 # -xW optimizes ifort compilation for Pentium 4 # -xW optimizes ifort compilation for Pentium 4
 # -ftrapuv initializes stack local variables to an unusual value to aid error detection. # -ftrapuv initializes stack local variables to an unusual value to aid error detection.
   F_CF_ALL      := $(F_CF_ALL) $(FCFLAGS_OPT) $(FCLFAGS_INIT) $(FCOMPILER_WARN)    F_CF_ALL      := $(F_CF_ALL) $(FCFLAGS_OPT) $(FCOMPILER_WARN)
 else else
   F_CF_ALL      := $(F_CF_ALL) $(FCLFAGS_INIT) $(FCOMPILER_WARN)    F_CF_ALL      := $(F_CF_ALL) -g $(FCFLAGS_INIT) $(FCOMPILER_WARN)
 endif endif
 #***********************************************************************************************# #***********************************************************************************************#
  


Legend:
Removed from v.1.48  
changed lines
  Added in v.1.49

Karen Tian
Powered by
ViewCVS 0.9.4